diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 11:18:01 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-20 12:06:10 +0300 |
| commit | b2655167c61550095be1713430ad28f92a00634e (patch) | |
| tree | 259dbc87ec6ca08f100c6dd76de28bac8fb8bcf1 /intern/ghost | |
| parent | d9bf6b2d3309de0e6c262bf5583c860810c3dc17 (diff) | |
GHost: Avoid macro re-definition by undefining the macro first
Should b totally harmless since the define was overriten anyway.
Diffstat (limited to 'intern/ghost')
| -rw-r--r-- | intern/ghost/intern/GHOST_DisplayManagerWin32.cpp | 1 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemPathsWin32.h | 1 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_SystemWin32.h | 3 | ||||
| -rw-r--r-- | intern/ghost/intern/GHOST_TaskbarWin32.h | 3 |
4 files changed, 6 insertions, 2 deletions
diff --git a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp index 65d5e650251..252ea775329 100644 --- a/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp +++ b/intern/ghost/intern/GHOST_DisplayManagerWin32.cpp @@ -34,6 +34,7 @@ #include "GHOST_DisplayManagerWin32.h" #include "GHOST_Debug.h" +#undef _WIN32_WINNT #define _WIN32_WINNT 0x501 // require Windows XP or newer #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/intern/ghost/intern/GHOST_SystemPathsWin32.h b/intern/ghost/intern/GHOST_SystemPathsWin32.h index b63d20bfcbd..5685a57eba8 100644 --- a/intern/ghost/intern/GHOST_SystemPathsWin32.h +++ b/intern/ghost/intern/GHOST_SystemPathsWin32.h @@ -37,6 +37,7 @@ #error WIN32 only! #endif // WIN32 +#undef _WIN32_WINNT #define _WIN32_WINNT 0x501 // require Windows XP or newer #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/intern/ghost/intern/GHOST_SystemWin32.h b/intern/ghost/intern/GHOST_SystemWin32.h index 0a8837294db..3085fde610b 100644 --- a/intern/ghost/intern/GHOST_SystemWin32.h +++ b/intern/ghost/intern/GHOST_SystemWin32.h @@ -38,7 +38,8 @@ #endif // WIN32 #ifndef __MINGW64__ -#define _WIN32_WINNT 0x501 // require Windows XP or newer +# undef _WIN32_WINNT +# define _WIN32_WINNT 0x501 // require Windows XP or newer #endif #define WIN32_LEAN_AND_MEAN #include <windows.h> diff --git a/intern/ghost/intern/GHOST_TaskbarWin32.h b/intern/ghost/intern/GHOST_TaskbarWin32.h index 04196701fe9..6fcff297237 100644 --- a/intern/ghost/intern/GHOST_TaskbarWin32.h +++ b/intern/ghost/intern/GHOST_TaskbarWin32.h @@ -9,7 +9,8 @@ #endif // WIN32 #ifndef __MINGW64__ -#define _WIN32_WINNT 0x501 // require Windows XP or newer +# undef _WIN32_WINNT +# define _WIN32_WINNT 0x501 // require Windows XP or newer #endif #define WIN32_LEAN_AND_MEAN #include <windows.h> |