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

[lordhoto at users.sourceforge.net]

Revision: 50346
          http://scummvm.svn.sourceforge.net/scummvm/?rev=50346&view=rev
Author:   lordhoto
Date:     2010-06-26 21:55:52 +0000 (Sat, 26 Jun 2010)

Log Message:
-----------
Define WIN32_LEAN_AND_MEAN before including windows.h.

This will cause our code to include less functionality, but might on the other hand fasten up the compilation.

Modified Paths:
--------------
    scummvm/trunk/backends/midi/windows.cpp
    scummvm/trunk/backends/platform/sdl/main.cpp
    scummvm/trunk/backends/platform/sdl/sdl.cpp
    scummvm/trunk/backends/plugins/win32/win32-provider.cpp
    scummvm/trunk/engines/engine.cpp

Modified: scummvm/trunk/backends/midi/windows.cpp
===================================================================
--- scummvm/trunk/backends/midi/windows.cpp	2010-06-26 21:36:25 UTC (rev 50345)
+++ scummvm/trunk/backends/midi/windows.cpp	2010-06-26 21:55:52 UTC (rev 50346)
@@ -24,6 +24,7 @@
 
 #if defined(WIN32) && !defined(_WIN32_WCE)
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 // winnt.h defines ARRAYSIZE, but we want our own one...
 #undef ARRAYSIZE

Modified: scummvm/trunk/backends/platform/sdl/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/main.cpp	2010-06-26 21:36:25 UTC (rev 50345)
+++ scummvm/trunk/backends/platform/sdl/main.cpp	2010-06-26 21:55:52 UTC (rev 50346)
@@ -28,6 +28,7 @@
 // otherwise we will get errors about the windows headers redefining
 // "ARRAYSIZE" for example.
 #if defined(WIN32) && !defined(__SYMBIAN32__)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 // winnt.h defines ARRAYSIZE, but we want our own one...
 #undef ARRAYSIZE

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2010-06-26 21:36:25 UTC (rev 50345)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2010-06-26 21:55:52 UTC (rev 50346)
@@ -24,6 +24,7 @@
  */
 
 #if defined(WIN32)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 // winnt.h defines ARRAYSIZE, but we want our own one... - this is needed before including util.h
 #undef ARRAYSIZE

Modified: scummvm/trunk/backends/plugins/win32/win32-provider.cpp
===================================================================
--- scummvm/trunk/backends/plugins/win32/win32-provider.cpp	2010-06-26 21:36:25 UTC (rev 50345)
+++ scummvm/trunk/backends/plugins/win32/win32-provider.cpp	2010-06-26 21:55:52 UTC (rev 50346)
@@ -30,6 +30,7 @@
 #include "common/debug.h"
 #include "common/fs.h"
 
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 

Modified: scummvm/trunk/engines/engine.cpp
===================================================================
--- scummvm/trunk/engines/engine.cpp	2010-06-26 21:36:25 UTC (rev 50345)
+++ scummvm/trunk/engines/engine.cpp	2010-06-26 21:55:52 UTC (rev 50346)
@@ -23,6 +23,7 @@
  */
 
 #if defined(WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #include <direct.h>
 // winnt.h defines ARRAYSIZE, but we want our own one...


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