aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/scicore/tools.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'engines/sci/scicore/tools.cpp')
-rw-r--r--engines/sci/scicore/tools.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/scicore/tools.cpp b/engines/sci/scicore/tools.cpp
index 54c6e5e89c..19a721b25b 100644
--- a/engines/sci/scicore/tools.cpp
+++ b/engines/sci/scicore/tools.cpp
@@ -23,19 +23,18 @@
*
*/
-
-#include "common/archive.h"
-#include "common/file.h"
-#include "common/util.h"
-
-
#ifdef _MSC_VER
# include <sys/timeb.h>
# include <windows.h>
# include <sys/types.h>
# include <sys/stat.h>
+# undef ARRAYSIZE
#endif
+#include "common/archive.h"
+#include "common/file.h"
+#include "common/util.h"
+
#ifdef WIN32
# include <windows.h>
# include <errno.h>
@@ -61,6 +60,7 @@
#include "common/scummsys.h"
#include "common/str.h"
+# undef ARRAYSIZE
#ifdef UNIX
#define _GNU_SOURCE /* For FNM_CASEFOLD in fnmatch.h */