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 /backends | |
| 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
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 10 |
1 files changed, 6 insertions, 4 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 |