diff options
| author | Max Horn | 2010-03-18 15:04:57 +0000 |
|---|---|---|
| committer | Max Horn | 2010-03-18 15:04:57 +0000 |
| commit | 0e0e11e6417fc431329386a5bb17cea3f84d1c5a (patch) | |
| tree | c8c994a257c481aea2da79617f62baff90e4970c | |
| parent | 4e99cfc549d404c8c7b9b3e3478e12975039980d (diff) | |
| download | scummvm-rg350-0e0e11e6417fc431329386a5bb17cea3f84d1c5a.tar.gz scummvm-rg350-0e0e11e6417fc431329386a5bb17cea3f84d1c5a.tar.bz2 scummvm-rg350-0e0e11e6417fc431329386a5bb17cea3f84d1c5a.zip | |
Fix warnings
svn-id: r48277
| -rw-r--r-- | backends/midi/coreaudio.cpp | 2 | ||||
| -rw-r--r-- | backends/midi/coremidi.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index df02f62c32..d52547c997 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -142,7 +142,7 @@ int MidiDriver_CORE::open() { } if (err != noErr) - warning("Failed loading custom sound font '%s' (error %ld)\n", soundfont, err); + warning("Failed loading custom sound font '%s' (error %ld)\n", soundfont, (long)err); } #ifdef COREAUDIO_DISABLE_REVERB diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp index a1191c5129..e48b98a807 100644 --- a/backends/midi/coremidi.cpp +++ b/backends/midi/coremidi.cpp @@ -109,8 +109,8 @@ void MidiDriver_CoreMIDI::close() { } void MidiDriver_CoreMIDI::send(uint32 b) { - assert(mOutPort != NULL); - assert(mDest != NULL); + assert(mOutPort != 0); + assert(mDest != 0); // Extract the MIDI data byte status_byte = (b & 0x000000FF); @@ -153,8 +153,8 @@ void MidiDriver_CoreMIDI::send(uint32 b) { } void MidiDriver_CoreMIDI::sysEx(const byte *msg, uint16 length) { - assert(mOutPort != NULL); - assert(mDest != NULL); + assert(mOutPort != 0); + assert(mDest != 0); byte buf[384]; MIDIPacketList *packetList = (MIDIPacketList *)buf; |