diff options
| author | Max Horn | 2010-11-29 16:18:43 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-29 16:18:43 +0000 |
| commit | df05ed1a46516f7e4d5c6e78f7f096208dbad790 (patch) | |
| tree | e7b9077c9a92d5ff54e22705cdd6c9ff50faa38a /backends/midi | |
| parent | 4e0e406181a36e5f5ff59e6b917f81f317e1de1a (diff) | |
| download | scummvm-rg350-df05ed1a46516f7e4d5c6e78f7f096208dbad790.tar.gz scummvm-rg350-df05ed1a46516f7e4d5c6e78f7f096208dbad790.tar.bz2 scummvm-rg350-df05ed1a46516f7e4d5c6e78f7f096208dbad790.zip | |
BACKENDS: Include scummsys.h at top of all .cpp files, *before* any #ifdefs
svn-id: r54573
Diffstat (limited to 'backends/midi')
| -rw-r--r-- | backends/midi/coreaudio.cpp | 6 | ||||
| -rw-r--r-- | backends/midi/coremidi.cpp | 6 | ||||
| -rw-r--r-- | backends/midi/dmedia.cpp | 6 | ||||
| -rw-r--r-- | backends/midi/stmidi.cpp | 6 | ||||
| -rw-r--r-- | backends/midi/windows.cpp | 2 |
5 files changed, 18 insertions, 8 deletions
diff --git a/backends/midi/coreaudio.cpp b/backends/midi/coreaudio.cpp index 97db5cb292..62e9a6d0f4 100644 --- a/backends/midi/coreaudio.cpp +++ b/backends/midi/coreaudio.cpp @@ -22,11 +22,13 @@ * $Id$ */ -#ifdef MACOSX - // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include "common/scummsys.h" + +#ifdef MACOSX + // HACK to disable deprecated warnings under Mac OS X 10.5. // Apple depracted the AUGraphNewNode & AUGraphGetNodeInfo APIs // in favor of the new AUGraphAddNode & AUGraphNodeInfo APIs. diff --git a/backends/midi/coremidi.cpp b/backends/midi/coremidi.cpp index bca16df61a..2df9f78383 100644 --- a/backends/midi/coremidi.cpp +++ b/backends/midi/coremidi.cpp @@ -22,11 +22,13 @@ * $Id$ */ -#ifdef MACOSX - // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include "common/scummsys.h" + +#ifdef MACOSX + #include "common/config-manager.h" #include "common/util.h" #include "sound/musicplugin.h" diff --git a/backends/midi/dmedia.cpp b/backends/midi/dmedia.cpp index 5e4088fa17..95a199f8bc 100644 --- a/backends/midi/dmedia.cpp +++ b/backends/midi/dmedia.cpp @@ -27,12 +27,14 @@ * some code liberated from seq.cpp and coremidi.cpp */ -#if defined(IRIX) - // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL #include "common/scummsys.h" + +#if defined(IRIX) + +#include "common/scummsys.h" #include "common/util.h" #include "common/config-manager.h" #include "sound/musicplugin.h" diff --git a/backends/midi/stmidi.cpp b/backends/midi/stmidi.cpp index 01e28aa5ca..6e4d69f255 100644 --- a/backends/midi/stmidi.cpp +++ b/backends/midi/stmidi.cpp @@ -34,11 +34,13 @@ * cycles. I might change so sysex messages are sent the other way later. */ -#if defined __MINT__ - // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include "common/scummsys.h" + +#if defined __MINT__ + #include <osbind.h> #include "sound/mpu401.h" #include "common/util.h" diff --git a/backends/midi/windows.cpp b/backends/midi/windows.cpp index 81b29219b4..40d9bd8ebd 100644 --- a/backends/midi/windows.cpp +++ b/backends/midi/windows.cpp @@ -22,6 +22,8 @@ * $Id$ */ +#include "common/scummsys.h" + #if defined(WIN32) && !defined(_WIN32_WCE) // Disable symbol overrides so that we can use system headers. |