diff options
| author | Max Horn | 2010-11-29 16:16:50 +0000 |
|---|---|---|
| committer | Max Horn | 2010-11-29 16:16:50 +0000 |
| commit | 4e0e406181a36e5f5ff59e6b917f81f317e1de1a (patch) | |
| tree | 1748bdcb0113619f05cc6f603f943753870eacf2 /backends/graphics/sdl | |
| parent | 69c2fc5cebac767283f0f587d92f8842ab9f287b (diff) | |
| download | scummvm-rg350-4e0e406181a36e5f5ff59e6b917f81f317e1de1a.tar.gz scummvm-rg350-4e0e406181a36e5f5ff59e6b917f81f317e1de1a.tar.bz2 scummvm-rg350-4e0e406181a36e5f5ff59e6b917f81f317e1de1a.zip | |
SDL: Move #include <SDL.h> into a special wrapper file
svn-id: r54572
Diffstat (limited to 'backends/graphics/sdl')
| -rw-r--r-- | backends/graphics/sdl/sdl-graphics.cpp | 3 | ||||
| -rw-r--r-- | backends/graphics/sdl/sdl-graphics.h | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/backends/graphics/sdl/sdl-graphics.cpp b/backends/graphics/sdl/sdl-graphics.cpp index 4982336e9f..226285c593 100644 --- a/backends/graphics/sdl/sdl-graphics.cpp +++ b/backends/graphics/sdl/sdl-graphics.cpp @@ -25,9 +25,6 @@ #if defined(SDL_BACKEND) -// Disable symbol overrides so that we can use system headers. -#define FORBIDDEN_SYMBOL_EXCEPTION_FILE - #include "backends/graphics/sdl/sdl-graphics.h" #include "backends/events/sdl/sdl-events.h" #include "backends/platform/sdl/sdl.h" diff --git a/backends/graphics/sdl/sdl-graphics.h b/backends/graphics/sdl/sdl-graphics.h index 62f87ee238..6a55a3d489 100644 --- a/backends/graphics/sdl/sdl-graphics.h +++ b/backends/graphics/sdl/sdl-graphics.h @@ -33,11 +33,8 @@ #include "backends/events/sdl/sdl-events.h" -#if defined(__SYMBIAN32__) -#include <esdl\SDL.h> -#else -#include <SDL.h> -#endif +#include "backends/platform/sdl/sdl-sys.h" + #if !defined(_WIN32_WCE) && !defined(__SYMBIAN32__) // Uncomment this to enable the 'on screen display' code. |