Simple ifndef guards, so we don't get redefines.
authorNathan Letwory <nathan@letworyinteractive.com>
Thu, 21 Jul 2011 20:54:47 +0000 (20:54 +0000)
committerNathan Letwory <nathan@letworyinteractive.com>
Thu, 21 Jul 2011 20:54:47 +0000 (20:54 +0000)
intern/ghost/intern/GHOST_SystemPathsWin32.cpp
intern/ghost/intern/GHOST_SystemWin32.cpp

index ae376bc37a5140023ab41a017acfc8b9de8921df..523d119c7e74ec0ce87663d5eba89bfad3cee5c0 100644 (file)
@@ -32,7 +32,9 @@
 
 #include "GHOST_SystemPathsWin32.h"
 
+#ifndef _WIN32_IE
 #define _WIN32_IE 0x0501
+#endif
 #include <shlobj.h>
 
 #if defined(__MINGW32__) || defined(__CYGWIN__)
index d5dd77b7c831e75a3836fd860c46cc3af0f65eca..2a3eb74d1e20dcc3dc9dd21dfe871c1206379369 100644 (file)
@@ -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