diff options
| author | Enrico Rolfi | 2002-05-05 19:04:04 +0000 |
|---|---|---|
| committer | Enrico Rolfi | 2002-05-05 19:04:04 +0000 |
| commit | 00f35bec5a387a2bd4dc983372245edb8e4a7c8f (patch) | |
| tree | 012a695d218c4707ae3de02ee03610cc619f1d20 /sound | |
| parent | bdcb76fe3b288c248f7675238d6bb94ab196caaf (diff) | |
| download | scummvm-rg350-00f35bec5a387a2bd4dc983372245edb8e4a7c8f.tar.gz scummvm-rg350-00f35bec5a387a2bd4dc983372245edb8e4a7c8f.tar.bz2 scummvm-rg350-00f35bec5a387a2bd4dc983372245edb8e4a7c8f.zip | |
Fixed some things to support MacOS port and QuickTime
svn-id: r4211
Diffstat (limited to 'sound')
| -rw-r--r-- | sound/mididrv.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sound/mididrv.cpp b/sound/mididrv.cpp index 2400248fae..4cb1742bc2 100644 --- a/sound/mididrv.cpp +++ b/sound/mididrv.cpp @@ -449,12 +449,16 @@ MidiDriver *MidiDriver_SEQ_create() { #endif -#if defined(__APPLE__) || defined(__APPLE_CW) +#if defined(__APPLE__) || defined(macintosh) // FIXME - this is for Mac OS X and Mac OS 9. It's not really possible // to check for these *cleanly* without a configure script, though.. -#include <QuickTime/QuickTimeComponents.h> -#include <QuickTime/QuickTimeMusic.h> + +//#include <QuickTime/QuickTimeComponents.h> +//#include <QuickTime/QuickTimeMusic.h> + +#include <QuickTimeComponents.h> +#include <QuickTimeMusic.h> @@ -639,7 +643,7 @@ MidiDriver *MidiDriver_QT_create() { return new MidiDriver_QT(); } -#endif // __APPLE__ || __APPLE_CW +#endif // __APPLE__ || macintosh #ifdef __APPLE__ @@ -809,7 +813,7 @@ const char *MidiDriver::get_error_name(int error_code) { int MidiDriver::connect_to_timidity(int port) { int s = 0; -#if !defined(__APPLE__CW) && !defined(__MORPHOS__) // No socket support on Apple Carbon or Morphos +#if !defined(macintosh) && !defined(__MORPHOS__) // No socket support on Apple Carbon or Morphos struct hostent *serverhost; struct sockaddr_in sadd; |