Added WIN32_LEAN_AND_MEAN

dtool/src/dtoolbase/atomicAdjustWin32Impl.h

@@ -25,7 +25,7 @@
 #ifdef WIN32_VC
 
 #include "numeric_types.h"
-
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 ////////////////////////////////////////////////////////////////////

dtool/src/dtoolbase/mutexWin32Impl.h

@@ -23,7 +23,7 @@
 #include "selectThreadImpl.h"
 
 #ifdef WIN32_VC
-
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 ////////////////////////////////////////////////////////////////////

dtool/src/dtoolutil/pfstreamBuf.h

@@ -32,6 +32,7 @@
 #endif
 
 #ifdef WIN_PIPE_CALLS
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 #else  // WIN_PIPE_CALLS

panda/src/express/dcast.cxx

@@ -20,6 +20,7 @@
 #include "config_express.h"
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>  // for IsBadWritePtr()
 #endif
 

panda/src/express/error_utils.cxx

@@ -24,7 +24,7 @@
 #include <stdio.h>
 
 #if defined(WIN32_VC)
-  #include <winsock.h>
+  #include <winsock2.h>
 #endif
 
 ////////////////////////////////////////////////////////////////////

panda/src/express/trueClock.cxx

@@ -34,6 +34,7 @@ TrueClock *TrueClock::_global_ptr = NULL;
 ////////////////////////////////////////////////////////////////////
 
 #include <sys/timeb.h>
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 static const double _0001 = 1.0 / 1000.0;

panda/src/express/windowsRegistry.cxx

@@ -21,7 +21,7 @@
 #include "textEncoder.h"
 
 #ifdef WIN32_VC
-
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 ////////////////////////////////////////////////////////////////////

panda/src/glgsg/glgsg.h

@@ -40,6 +40,7 @@
 
 #ifdef WIN32_VC
 // Must include windows.h before gl.h on NT
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 #endif
 

panda/src/net/connectionManager.cxx

@@ -25,7 +25,7 @@
 #include "mutexHolder.h"
 
 #ifdef WIN32_VC
-#include <winsock.h>  // For gethostname()
+#include <winsock2.h>  // For gethostname()
 #endif
 
 ////////////////////////////////////////////////////////////////////

panda/src/pipeline/threadWin32Impl.h

@@ -29,6 +29,7 @@
 #include "mutexWin32Impl.h"
 #include "conditionVarWin32Impl.h"
 
+#define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
 
 class Thread;

panda/src/pnmimagetypes/pnmFileTypeJPG.h

@@ -28,6 +28,7 @@
 #include "pnmWriter.h"
 
 #if defined(_WIN32)
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>  // we need to include this before jpeglib.
 #endif
 

panda/src/wgldisplay/wglGraphicsBuffer.h

@@ -26,7 +26,7 @@
 // This must be included after we have included glgsg.h (which
 // includes gl.h).
 #include "wglext.h"
-
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 
 ////////////////////////////////////////////////////////////////////

panda/src/windisplay/winDetectDx8.cxx

@@ -21,8 +21,8 @@
 
 #ifdef HAVE_DX8
 
+#define WIN32_LEAN_AND_MEAN
 #include <d3d8.h>
-
 #include "graphicsStateGuardian.h"
 #include "graphicsPipe.h"
 #include "displaySearchParameters.h"

panda/src/windisplay/winDetectDx9.cxx

@@ -21,13 +21,12 @@
 
 #ifdef HAVE_DX9
 
+#define WIN32_LEAN_AND_MEAN
 #include <d3d9.h>
-
 #include "graphicsStateGuardian.h"
 #include "graphicsPipe.h"
 #include "displaySearchParameters.h"
 
-
 #define DX8 0
 #define Direct3DCreate Direct3DCreate9
 

panda/src/windisplay/winGraphicsWindow.h

@@ -21,7 +21,7 @@
 
 #include "pandabase.h"
 #include "graphicsWindow.h"
-
+#define WIN32_LEAN_AND_MEAN 1
 #include <windows.h>
 
 class WinGraphicsPipe;