From b3d2ec3db26d38b2bec68bbb76575e2da1db571d Mon Sep 17 00:00:00 2001
From: Bei Yang <beiyangles@gmail.com>
Date: Mon, 7 Sep 2009 22:39:52 +0000
Subject: [PATCH] Redefine of WIN32_LEAN_AND_MEAN avoided

---
 panda/src/windisplay/winGraphicsWindow.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/panda/src/windisplay/winGraphicsWindow.h b/panda/src/windisplay/winGraphicsWindow.h
index 82da55edcd..0bd7736ad9 100644
--- a/panda/src/windisplay/winGraphicsWindow.h
+++ b/panda/src/windisplay/winGraphicsWindow.h
@@ -17,13 +17,17 @@
 
 #include "pandabase.h"
 #include "graphicsWindow.h"
-#define WIN32_LEAN_AND_MEAN 1
+#ifndef WIN32_LEAN_AND_MEAN
+	#define WIN32_LEAN_AND_MEAN 1
+#endif
 #include <windows.h>
 
 class WinGraphicsPipe;
 
-#define PM_ACTIVE   (WM_APP+123)
-#define PM_INACTIVE  (WM_APP+124)
+#define PM_ACTIVE   (WM_APP+123)
+
+#define PM_INACTIVE  (WM_APP+124)
+
 
 
 ////////////////////////////////////////////////////////////////////