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

lavosspawn at users.sourceforge.net lavosspawn at users.sourceforge.net
Sat Mar 17 16:45:08 CET 2007


Revision: 26171
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26171&view=rev
Author:   lavosspawn
Date:     2007-03-17 08:45:05 -0700 (Sat, 17 Mar 2007)

Log Message:
-----------
fixed MSVC compiler warning because winnt.h defines its own ARRAYSIZE #define

Modified Paths:
--------------
    scummvm/trunk/backends/platform/sdl/sdl.cpp
    scummvm/trunk/common/config-manager.cpp
    scummvm/trunk/engines/engine.cpp

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2007-03-17 15:44:26 UTC (rev 26170)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2007-03-17 15:45:05 UTC (rev 26171)
@@ -21,6 +21,12 @@
  *
  */
 
+#if defined(WIN32)
+#include <windows.h>
+// winnt.h defines ARRAYSIZE, but we want our own one...
+#undef ARRAYSIZE
+#endif
+
 #include "backends/platform/sdl/sdl-common.h"
 #include "backends/plugins/sdl/sdl-provider.h"
 #include "common/config-manager.h"
@@ -33,10 +39,6 @@
 
 #include "icons/scummvm.xpm"
 
-#if defined(WIN32)
-#include <windows.h>
-#endif
-
 #if defined(__SYMBIAN32__)
 #include "SymbianOs.h"
 #endif

Modified: scummvm/trunk/common/config-manager.cpp
===================================================================
--- scummvm/trunk/common/config-manager.cpp	2007-03-17 15:44:26 UTC (rev 26170)
+++ scummvm/trunk/common/config-manager.cpp	2007-03-17 15:45:05 UTC (rev 26171)
@@ -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

Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp	2007-03-17 15:44:26 UTC (rev 26170)
+++ scummvm/trunk/engines/engine.cpp	2007-03-17 15:45:05 UTC (rev 26171)
@@ -19,6 +19,13 @@
  * $Id$
  */
 
+#if defined(WIN32)
+#include <windows.h>
+#include <direct.h>
+// winnt.h defines ARRAYSIZE, but we want our own one...
+#undef ARRAYSIZE
+#endif
+
 #include "common/stdafx.h"
 #include "engines/engine.h"
 #include "common/config-manager.h"
@@ -29,11 +36,6 @@
 #include "gui/message.h"
 #include "sound/mixer.h"
 
-#if defined(WIN32)
-#include <windows.h>
-#include <direct.h>
-#endif
-
 #ifdef _WIN32_WCE
 extern bool isSmartphone(void);
 #endif


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




More information about the Scummvm-git-logs mailing list