diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-22 00:54:47 +0400 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2011-07-22 00:54:47 +0400 |
| commit | b326a6841ecae45a59ba14f51741e66788961cea (patch) | |
| tree | 745831461da9f6b8d529b79e73e818b7f6ceea5b /intern/ghost | |
| parent | eea7c358c7d606f9a4df8f11d42ac5b0df28a6d4 (diff) | |
Simple ifndef guards, so we don't get redefines.
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemPathsWin32.cpp | 2 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp index ae376bc37a5..523d119c7e7 100644 --- a/intern/ghost/intern/GHOST_SystemPathsWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemPathsWin32.cpp @@ -32,7 +32,9 @@ #include "GHOST_SystemPathsWin32.h" +#ifndef _WIN32_IE #define _WIN32_IE 0x0501 +#endif #include <shlobj.h> #if defined(__MINGW32__) || defined(__CYGWIN__) diff --git a/intern/ghost/intern/GHOST_SystemWin32.cpp b/intern/ghost/intern/GHOST_SystemWin32.cpp index d5dd77b7c83..2a3eb74d1e2 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.cpp +++ b/intern/ghost/intern/GHOST_SystemWin32.cpp @@ -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 |