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/platform/sdl | |
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/platform/sdl')
-rw-r--r-- | backends/platform/sdl/amigaos/amigaos-main.cpp | 2 | ||||
-rw-r--r-- | backends/platform/sdl/amigaos/amigaos.cpp | 2 | ||||
-rw-r--r-- | backends/platform/sdl/macosx/macosx-main.cpp | 2 | ||||
-rw-r--r-- | backends/platform/sdl/macosx/macosx.cpp | 6 | ||||
-rw-r--r-- | backends/platform/sdl/posix/posix-main.cpp | 2 | ||||
-rw-r--r-- | backends/platform/sdl/posix/posix.cpp | 2 | ||||
-rw-r--r-- | backends/platform/sdl/sdl.cpp | 2 | ||||
-rw-r--r-- | backends/platform/sdl/win32/win32-main.cpp | 2 | ||||
-rw-r--r-- | backends/platform/sdl/win32/win32.cpp | 2 |
9 files changed, 19 insertions, 3 deletions
diff --git a/backends/platform/sdl/amigaos/amigaos-main.cpp b/backends/platform/sdl/amigaos/amigaos-main.cpp index db4598e879..beb27fd714 100644 --- a/backends/platform/sdl/amigaos/amigaos-main.cpp +++ b/backends/platform/sdl/amigaos/amigaos-main.cpp @@ -23,6 +23,8 @@ * */ +#include "common/scummsys.h" + #if defined(__amigaos4__) #include "backends/platform/sdl/amigaos/amigaos.h" diff --git a/backends/platform/sdl/amigaos/amigaos.cpp b/backends/platform/sdl/amigaos/amigaos.cpp index d2924445a3..77c2c2e21d 100644 --- a/backends/platform/sdl/amigaos/amigaos.cpp +++ b/backends/platform/sdl/amigaos/amigaos.cpp @@ -23,6 +23,8 @@ * */ +#include "common/scummsys.h" + #ifdef __amigaos4__ #include "backends/platform/sdl/amigaos/amigaos.h" diff --git a/backends/platform/sdl/macosx/macosx-main.cpp b/backends/platform/sdl/macosx/macosx-main.cpp index 023860b19f..94655f8118 100644 --- a/backends/platform/sdl/macosx/macosx-main.cpp +++ b/backends/platform/sdl/macosx/macosx-main.cpp @@ -23,6 +23,8 @@ * */ +#include "common/scummsys.h" + #ifdef MACOSX #include "backends/platform/sdl/macosx/macosx.h" diff --git a/backends/platform/sdl/macosx/macosx.cpp b/backends/platform/sdl/macosx/macosx.cpp index 814badbca4..5ea65b6449 100644 --- a/backends/platform/sdl/macosx/macosx.cpp +++ b/backends/platform/sdl/macosx/macosx.cpp @@ -23,11 +23,13 @@ * */ -#ifdef MACOSX - // Disable symbol overrides so that we can use system headers. #define FORBIDDEN_SYMBOL_ALLOW_ALL +#include "common/scummsys.h" + +#ifdef MACOSX + #include "backends/platform/sdl/macosx/macosx.h" #include "backends/mixer/doublebuffersdl/doublebuffersdl-mixer.h" diff --git a/backends/platform/sdl/posix/posix-main.cpp b/backends/platform/sdl/posix/posix-main.cpp index de9eb2b7ef..10ed43f43f 100644 --- a/backends/platform/sdl/posix/posix-main.cpp +++ b/backends/platform/sdl/posix/posix-main.cpp @@ -23,6 +23,8 @@ * */ +#include "common/scummsys.h" + #if defined(UNIX) && !defined(MACOSX) && !defined(SAMSUNGTV) && !defined(LINUXMOTO) && !defined(GP2XWIZ) && !defined(GP2X) && !defined(DINGUX) #include "backends/platform/sdl/posix/posix.h" diff --git a/backends/platform/sdl/posix/posix.cpp b/backends/platform/sdl/posix/posix.cpp index c9c7304c0f..6f91188184 100644 --- a/backends/platform/sdl/posix/posix.cpp +++ b/backends/platform/sdl/posix/posix.cpp @@ -23,6 +23,8 @@ * */ +#include "common/scummsys.h" + #ifdef UNIX #include "backends/platform/sdl/posix/posix.h" diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 5d41c304ef..561e5b2aec 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -24,7 +24,7 @@ */ // Disable symbol overrides so that we can use system headers. -#define FORBIDDEN_SYMBOL_ALLOW_ALL +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE #ifdef WIN32 #define WIN32_LEAN_AND_MEAN diff --git a/backends/platform/sdl/win32/win32-main.cpp b/backends/platform/sdl/win32/win32-main.cpp index 25f208ddac..f2b570043f 100644 --- a/backends/platform/sdl/win32/win32-main.cpp +++ b/backends/platform/sdl/win32/win32-main.cpp @@ -23,6 +23,8 @@ * */ +#include "common/scummsys.h" + #ifdef WIN32 // Fix for bug #2895217 "MSVC compilation broken with r47595": diff --git a/backends/platform/sdl/win32/win32.cpp b/backends/platform/sdl/win32/win32.cpp index dce7b88c13..9723d1f68e 100644 --- a/backends/platform/sdl/win32/win32.cpp +++ b/backends/platform/sdl/win32/win32.cpp @@ -23,6 +23,8 @@ * */ +#include "common/scummsys.h" + #ifdef WIN32 #define WIN32_LEAN_AND_MEAN |