diff options
| author | Robert Göffringmann | 2007-03-17 15:45:05 +0000 |
|---|---|---|
| committer | Robert Göffringmann | 2007-03-17 15:45:05 +0000 |
| commit | 4a11e7299ac0b6c9a877f1267003162648e3bb6e (patch) | |
| tree | a8e308d0fb3c9205fe9ab705b4c4df4b09190052 | |
| parent | 53624376b4d614689695d1ea56c1052cd0e7ad12 (diff) | |
| download | scummvm-rg350-4a11e7299ac0b6c9a877f1267003162648e3bb6e.tar.gz scummvm-rg350-4a11e7299ac0b6c9a877f1267003162648e3bb6e.tar.bz2 scummvm-rg350-4a11e7299ac0b6c9a877f1267003162648e3bb6e.zip | |
fixed MSVC compiler warning because winnt.h defines its own ARRAYSIZE #define
svn-id: r26171
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 10 | ||||
| -rw-r--r-- | common/config-manager.cpp | 10 | ||||
| -rw-r--r-- | engines/engine.cpp | 12 |
3 files changed, 19 insertions, 13 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index ee43d2ee26..b846afe2c0 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -21,6 +21,12 @@ * */ +#if defined(WIN32) +#include <windows.h> +// winnt.h defines ARRAYSIZE, but we want our own one... +#undef ARRAYSIZE +#endif + #include "backends/platform/sdl/sdl-common.h" #include "backends/plugins/sdl/sdl-provider.h" #include "common/config-manager.h" @@ -33,10 +39,6 @@ #include "icons/scummvm.xpm" -#if defined(WIN32) -#include <windows.h> -#endif - #if defined(__SYMBIAN32__) #include "SymbianOs.h" #endif diff --git a/common/config-manager.cpp b/common/config-manager.cpp index 8da061406b..f8426f18d0 100644 --- a/common/config-manager.cpp +++ b/common/config-manager.cpp @@ -21,6 +21,12 @@ * */ +#if defined(WIN32) +#include <windows.h> +// winnt.h defines ARRAYSIZE, but we want our own one... +#undef ARRAYSIZE +#endif + #include "common/stdafx.h" #include "common/config-manager.h" @@ -29,10 +35,6 @@ DECLARE_SINGLETON(Common::ConfigManager); -#if defined(WIN32) -#include <windows.h> -#endif - #ifdef __PLAYSTATION2__ #include "backends/platform/ps2/systemps2.h" #endif diff --git a/engines/engine.cpp b/engines/engine.cpp index a869ba95cc..0d870e51cd 100644 --- a/engines/engine.cpp +++ b/engines/engine.cpp @@ -19,6 +19,13 @@ * $Id$ */ +#if defined(WIN32) +#include <windows.h> +#include <direct.h> +// winnt.h defines ARRAYSIZE, but we want our own one... +#undef ARRAYSIZE +#endif + #include "common/stdafx.h" #include "engines/engine.h" #include "common/config-manager.h" @@ -29,11 +36,6 @@ #include "gui/message.h" #include "sound/mixer.h" -#if defined(WIN32) -#include <windows.h> -#include <direct.h> -#endif - #ifdef _WIN32_WCE extern bool isSmartphone(void); #endif |