diff options
| author | Christopher Page | 2008-08-05 02:31:26 +0000 |
|---|---|---|
| committer | Christopher Page | 2008-08-05 02:31:26 +0000 |
| commit | 2acbc2a88eac1abe4bd548c5eb67a7d90fead4d1 (patch) | |
| tree | 834ea4fc958c3f21b4e5e4df92d7f0d9a66c50fe | |
| parent | 0725f7ec932311987a936d11cefd4ce50f5fc49e (diff) | |
| parent | f7cc93f71ab5b7526a69bae5df80abeafeef5d31 (diff) | |
| download | scummvm-rg350-2acbc2a88eac1abe4bd548c5eb67a7d90fead4d1.tar.gz scummvm-rg350-2acbc2a88eac1abe4bd548c5eb67a7d90fead4d1.tar.bz2 scummvm-rg350-2acbc2a88eac1abe4bd548c5eb67a7d90fead4d1.zip | |
Merged revisions 33626-33627 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
svn-id: r33629
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 12 | ||||
| -rw-r--r-- | common/system.cpp | 7 |
2 files changed, 8 insertions, 11 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index 75bac0f536..5c3b87309d 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -23,14 +23,18 @@ * */ +#if defined(WIN32) +#include <windows.h> +#if defined(ARRAYSIZE) +// winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h +#undef ARRAYSIZE +#endif +#endif + #include "backends/platform/sdl/sdl.h" #include "common/config-manager.h" #include "common/events.h" #include "common/file.h" -#if defined(WIN32) && defined(ARRAYSIZE) -// winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h -#undef ARRAYSIZE -#endif #include "common/util.h" #include "backends/saves/default/default-saves.h" diff --git a/common/system.cpp b/common/system.cpp index e3f81a69b6..3e07e4ac4c 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -28,16 +28,9 @@ #include "common/config-manager.h" #include "common/system.h" -#include "common/timer.h" -#if defined(WIN32) && defined(ARRAYSIZE) -// winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h -#undef ARRAYSIZE -#endif -#include "common/util.h" #include "graphics/colormasks.h" #include "gui/message.h" -#include "sound/mixer.h" OSystem *g_system = 0; |