[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [38585] branches/merwin-spacenav/intern/ ghost/intern: Simple ifndef guards, so we don't get redefines.

[Nathan Letwory]

Revision: 38585
          
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=38585
Author:   jesterking
Date:     2011-07-21 20:54:47 +0000 (Thu, 21 Jul 2011)
Log Message:
-----------
Simple ifndef guards, so we don't get redefines.

Modified Paths:
--------------
    branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
    branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemWin32.cpp

Modified: 
branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemPathsWin32.cpp
===================================================================
--- branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemPathsWin32.cpp     
2011-07-21 20:13:39 UTC (rev 38584)
+++ branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemPathsWin32.cpp     
2011-07-21 20:54:47 UTC (rev 38585)
@@ -32,7 +32,9 @@
 
 #include "GHOST_SystemPathsWin32.h"
 
+#ifndef _WIN32_IE
 #define _WIN32_IE 0x0501
+#endif
 #include <shlobj.h>
 
 #if defined(__MINGW32__) || defined(__CYGWIN__)

Modified: branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemWin32.cpp
===================================================================
--- branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemWin32.cpp  
2011-07-21 20:13:39 UTC (rev 38584)
+++ branches/merwin-spacenav/intern/ghost/intern/GHOST_SystemWin32.cpp  
2011-07-21 20:54:47 UTC (rev 38585)
@@ -48,7 +48,9 @@
 #include "GHOST_SystemWin32.h"
 #include "GHOST_EventDragnDrop.h"
 
+#ifndef _WIN32_IE
 #define _WIN32_IE 0x0501 /* shipped before XP, so doesn't impose additional 
requirements */
+#endif
 #include <shlobj.h>
 
 // win64 doesn't define GWL_USERDATA

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs