diff options
| author | Filippos Karapetis | 2008-08-04 15:01:41 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2008-08-04 15:01:41 +0000 |
| commit | 2efe13026d3d19583429f7e0de50b062db838980 (patch) | |
| tree | 5a21f1c510b4e0a50be33e56b4f8d5b1b0361969 | |
| parent | 05968b18c9dac22951618ce885d8e1587d94d324 (diff) | |
| download | scummvm-rg350-2efe13026d3d19583429f7e0de50b062db838980.tar.gz scummvm-rg350-2efe13026d3d19583429f7e0de50b062db838980.tar.bz2 scummvm-rg350-2efe13026d3d19583429f7e0de50b062db838980.zip | |
Fixing compilation under MSVC
svn-id: r33610
| -rw-r--r-- | backends/platform/sdl/sdl.cpp | 4 | ||||
| -rw-r--r-- | common/system.cpp | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp index d94271c10e..1095ddbddd 100644 --- a/backends/platform/sdl/sdl.cpp +++ b/backends/platform/sdl/sdl.cpp @@ -27,6 +27,10 @@ #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 1b18339623..ac45656202 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -29,6 +29,10 @@ #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" |