From 8327870c9fd4a17b86388cde5186bcc48d53a590 Mon Sep 17 00:00:00 2001 From: Laurent Gomila Date: Sun, 6 May 2012 17:32:10 +0200 Subject: [PATCH] Fixed warnings with recent MinGW versions that already define the Windows version macros --- src/SFML/Window/Win32/InputImpl.cpp | 6 ++++++ src/SFML/Window/Win32/JoystickImpl.hpp | 6 ++++++ src/SFML/Window/Win32/WindowImplWin32.cpp | 6 ++++++ 3 files changed, 18 insertions(+) diff --git a/src/SFML/Window/Win32/InputImpl.cpp b/src/SFML/Window/Win32/InputImpl.cpp index 7e9ad8b8..3b348ed6 100644 --- a/src/SFML/Window/Win32/InputImpl.cpp +++ b/src/SFML/Window/Win32/InputImpl.cpp @@ -25,6 +25,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// +#ifdef _WIN32_WINDOWS + #undef _WIN32_WINDOWS +#endif +#ifdef _WIN32_WINNT + #undef _WIN32_WINNT +#endif #define _WIN32_WINDOWS 0x0501 #define _WIN32_WINNT 0x0501 #include diff --git a/src/SFML/Window/Win32/JoystickImpl.hpp b/src/SFML/Window/Win32/JoystickImpl.hpp index 2f4fe9c4..f9a44a73 100644 --- a/src/SFML/Window/Win32/JoystickImpl.hpp +++ b/src/SFML/Window/Win32/JoystickImpl.hpp @@ -28,6 +28,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// +#ifdef _WIN32_WINDOWS + #undef _WIN32_WINDOWS +#endif +#ifdef _WIN32_WINNT + #undef _WIN32_WINNT +#endif #define _WIN32_WINDOWS 0x0501 #define _WIN32_WINNT 0x0501 #include diff --git a/src/SFML/Window/Win32/WindowImplWin32.cpp b/src/SFML/Window/Win32/WindowImplWin32.cpp index 59f9d67c..a01218c0 100644 --- a/src/SFML/Window/Win32/WindowImplWin32.cpp +++ b/src/SFML/Window/Win32/WindowImplWin32.cpp @@ -25,6 +25,12 @@ //////////////////////////////////////////////////////////// // Headers //////////////////////////////////////////////////////////// +#ifdef _WIN32_WINDOWS + #undef _WIN32_WINDOWS +#endif +#ifdef _WIN32_WINNT + #undef _WIN32_WINNT +#endif #define _WIN32_WINDOWS 0x0501 #define _WIN32_WINNT 0x0501 #include