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 /common | |
| 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 'common')
| -rw-r--r-- | common/config-manager.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
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 |