[Scummvm-cvs-logs] SF.net SVN: scummvm:[33610] scummvm/trunk

[thebluegr at users.sourceforge.net]

Revision: 33610
          http://scummvm.svn.sourceforge.net/scummvm/?rev=33610&view=rev
Author:   thebluegr
Date:     2008-08-04 15:01:41 +0000 (Mon, 04 Aug 2008)

Log Message:
-----------
Fixing compilation under MSVC

Modified Paths:
--------------
    scummvm/trunk/backends/platform/sdl/sdl.cpp
    scummvm/trunk/common/system.cpp

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2008-08-04 13:25:30 UTC (rev 33609)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2008-08-04 15:01:41 UTC (rev 33610)
@@ -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"

Modified: scummvm/trunk/common/system.cpp
===================================================================
--- scummvm/trunk/common/system.cpp	2008-08-04 13:25:30 UTC (rev 33609)
+++ scummvm/trunk/common/system.cpp	2008-08-04 15:01:41 UTC (rev 33610)
@@ -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"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.