diff options
| author | rubidium <rubidium@openttd.org> | 2009-07-14 16:43:45 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2009-07-14 16:43:45 +0000 |
| commit | e3c7a77b4066f00f3248e390184da874bd20d7ee (patch) | |
| tree | 616b02702d4044f27e435ab5e0f5d826da92a171 /src/music | |
| parent | 2b1c43f81f792a1aa28065c1fef4ea9cbad1f5a9 (diff) | |
| download | openttd-e3c7a77b4066f00f3248e390184da874bd20d7ee.tar.xz | |
(svn r16827) -Codechange: make OSX specific files include stdafx.h always as the first file. Also unify OSX specific stuff into osx_stdafx.h and remove unused includes.
Diffstat (limited to 'src/music')
| -rw-r--r-- | src/music/qtmidi.cpp | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/src/music/qtmidi.cpp b/src/music/qtmidi.cpp index dce3e1033..e49e13c33 100644 --- a/src/music/qtmidi.cpp +++ b/src/music/qtmidi.cpp @@ -21,36 +21,16 @@ #ifndef NO_QUICKTIME -#define MAC_OS_X_VERSION_MIN_REQUIRED MAC_OS_X_VERSION_10_3 -#include <AvailabilityMacros.h> - -/* - * OpenTTD includes. - */ -#define WindowClass OSX_WindowClass -#include <QuickTime/QuickTime.h> -#undef WindowClass - #include "../stdafx.h" #include "qtmidi.h" - -/* - * System includes. We need to workaround with some defines because there's - * stuff already defined in QuickTime headers. - */ -#define OTTD_Random OSX_OTTD_Random -#undef OTTD_Random -#undef WindowClass -#undef SL_ERROR -#undef bool - -#include <assert.h> -#include <unistd.h> -#include <fcntl.h> - -/* we need to include debug.h after CoreServices because defining DEBUG will break CoreServices in OSX 10.2 */ #include "../debug.h" +#define Rect OTTDRect +#define Point OTTDPoint +#include <QuickTime/QuickTime.h> +#undef Rect +#undef Point + static FMusicDriver_QtMidi iFMusicDriver_QtMidi; |