diff options
| -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; |