diff options
author | James Brown | 2002-04-13 04:39:04 +0000 |
---|---|---|
committer | James Brown | 2002-04-13 04:39:04 +0000 |
commit | 94670b2eefb8e65351c1a237b40ec84039fd3ec8 (patch) | |
tree | eebb261073fe58a232d3e0bfc75fba5331ac3c7d /simon | |
parent | 44d4c1ac6082eb3c3e11217d8fecd8a2713995ca (diff) | |
download | scummvm-rg350-94670b2eefb8e65351c1a237b40ec84039fd3ec8.tar.gz scummvm-rg350-94670b2eefb8e65351c1a237b40ec84039fd3ec8.tar.bz2 scummvm-rg350-94670b2eefb8e65351c1a237b40ec84039fd3ec8.zip |
Fix various warnings, and things preventing non-win32 platforms from compiling.
svn-id: r3916
Diffstat (limited to 'simon')
-rw-r--r-- | simon/midi.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/simon/midi.cpp b/simon/midi.cpp index 79bcb47c8f..ab6923b604 100644 --- a/simon/midi.cpp +++ b/simon/midi.cpp @@ -25,7 +25,6 @@ #include "system.h" #include "simon.h" - void MidiPlayer::read_from_file(void *dst, uint size) { if (fread(dst, size, 1, _input) != 1) error("Midi read error"); @@ -188,6 +187,7 @@ byte MidiPlayer::track_read_byte(Track *t) { } void MidiPlayer::initialize() { +#ifdef WIN32 uint i; MyMidiHdr *mmh; MIDIPROPTIMEDIV mptd; @@ -236,6 +236,7 @@ void MidiPlayer::initialize() { } _midi_var9 = true; +#endif } int MidiPlayer::fill(uint x, MyMidiHdr *mmh) { @@ -294,6 +295,7 @@ int MidiPlayer::fill(uint x, MyMidiHdr *mmh) { } int MidiPlayer::fill_helper(NoteRec *nr, MyMidiHdr *mmh) { +#ifdef WIN32 byte *lpdata; uint b; @@ -338,7 +340,7 @@ int MidiPlayer::fill_helper(NoteRec *nr, MyMidiHdr *mmh) { mmh->b += 12; } - +#endif return 0; } |