aboutsummaryrefslogtreecommitdiff
path: root/common/system.cpp
diff options
context:
space:
mode:
authorFilippos Karapetis2008-08-04 15:01:41 +0000
committerFilippos Karapetis2008-08-04 15:01:41 +0000
commit2efe13026d3d19583429f7e0de50b062db838980 (patch)
tree5a21f1c510b4e0a50be33e56b4f8d5b1b0361969 /common/system.cpp
parent05968b18c9dac22951618ce885d8e1587d94d324 (diff)
downloadscummvm-rg350-2efe13026d3d19583429f7e0de50b062db838980.tar.gz
scummvm-rg350-2efe13026d3d19583429f7e0de50b062db838980.tar.bz2
scummvm-rg350-2efe13026d3d19583429f7e0de50b062db838980.zip
Fixing compilation under MSVC
svn-id: r33610
Diffstat (limited to 'common/system.cpp')
-rw-r--r--common/system.cpp4
1 files changed, 4 insertions, 0 deletions
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"