diff options
Diffstat (limited to 'sound/softsynth/mt32')
| -rw-r--r-- | sound/softsynth/mt32/mt32_file.cpp | 4 | ||||
| -rw-r--r-- | sound/softsynth/mt32/mt32_file.h | 2 | ||||
| -rw-r--r-- | sound/softsynth/mt32/partial.cpp | 2 | ||||
| -rw-r--r-- | sound/softsynth/mt32/synth.cpp | 2 | ||||
| -rw-r--r-- | sound/softsynth/mt32/tables.cpp | 2 |
5 files changed, 3 insertions, 9 deletions
diff --git a/sound/softsynth/mt32/mt32_file.cpp b/sound/softsynth/mt32/mt32_file.cpp index 86cb29fd49..f4eba73d33 100644 --- a/sound/softsynth/mt32/mt32_file.cpp +++ b/sound/softsynth/mt32/mt32_file.cpp @@ -44,10 +44,6 @@ namespace MT32Emu { return fread(in, 1, size, fp); } - bool ANSIFile::readLine(char *in, size_t size) { - return fgets(in, (int)size, fp) != NULL; - } - bool ANSIFile::readBit8u(Bit8u *in) { int c = fgetc(fp); if (c == EOF) diff --git a/sound/softsynth/mt32/mt32_file.h b/sound/softsynth/mt32/mt32_file.h index 5f05c9e9ae..27c8ccbe46 100644 --- a/sound/softsynth/mt32/mt32_file.h +++ b/sound/softsynth/mt32/mt32_file.h @@ -35,7 +35,6 @@ public: virtual ~File() {} virtual void close() = 0; virtual size_t read(void *in, size_t size) = 0; - virtual bool readLine(char *in, size_t size) = 0; virtual bool readBit8u(Bit8u *in) = 0; virtual bool readBit16u(Bit16u *in); virtual bool readBit32u(Bit32u *in); @@ -55,7 +54,6 @@ public: bool open(const char *filename, OpenMode mode); void close(); size_t read(void *in, size_t size); - bool readLine(char *in, size_t size); bool readBit8u(Bit8u *in); size_t write(const void *out, size_t size); bool writeBit8u(Bit8u out); diff --git a/sound/softsynth/mt32/partial.cpp b/sound/softsynth/mt32/partial.cpp index 1aab2a8de7..2866c7757d 100644 --- a/sound/softsynth/mt32/partial.cpp +++ b/sound/softsynth/mt32/partial.cpp @@ -25,7 +25,7 @@ #include "mt32emu.h" -#if defined(MACOSX) || defined(__solaris__) +#if defined(MACOSX) || defined(SOLARIS) // Older versions of Mac OS X didn't supply a powf function, so using it // will cause a binary incompatibility when trying to run a binary built // on a newer OS X release on an olderr one. And Solaris 8 doesn't provide diff --git a/sound/softsynth/mt32/synth.cpp b/sound/softsynth/mt32/synth.cpp index 785e8098c7..366da50d01 100644 --- a/sound/softsynth/mt32/synth.cpp +++ b/sound/softsynth/mt32/synth.cpp @@ -25,7 +25,7 @@ #include "mt32emu.h" -#if defined(MACOSX) || defined(__solaris__) +#if defined(MACOSX) || defined(SOLARIS) // Older versions of Mac OS X didn't supply a powf function, so using it // will cause a binary incompatibility when trying to run a binary built // on a newer OS X release on an olderr one. And Solaris 8 doesn't provide diff --git a/sound/softsynth/mt32/tables.cpp b/sound/softsynth/mt32/tables.cpp index 20b7cf289a..5865ba2950 100644 --- a/sound/softsynth/mt32/tables.cpp +++ b/sound/softsynth/mt32/tables.cpp @@ -25,7 +25,7 @@ #include "mt32emu.h" -#if defined(MACOSX) || defined(__solaris__) +#if defined(MACOSX) || defined(SOLARIS) // Older versions of Mac OS X didn't supply a powf function, so using it // will cause a binary incompatibility when trying to run a binary built // on a newer OS X release on an olderr one. And Solaris 8 doesn't provide |