diff options
| author | Sfan5 <sfan5@live.de> | 2014-04-14 18:03:28 +0200 |
|---|---|---|
| committer | Sfan5 <sfan5@live.de> | 2014-04-14 20:09:42 +0200 |
| commit | d436502fa499255236350fc9204f9c508414704e (patch) | |
| tree | adf857a647ad396e71f6e2a0c2959c0c3a66c459 | |
| parent | dcafad2f736aa9b7174bdf7313735d89b981e0c6 (diff) | |
| download | minetest-d436502fa499255236350fc9204f9c508414704e.tar.gz minetest-d436502fa499255236350fc9204f9c508414704e.tar.bz2 minetest-d436502fa499255236350fc9204f9c508414704e.zip | |
Fix problem with newer MinGW runtimes
| -rw-r--r-- | src/porting.cpp | 3 | ||||
| -rw-r--r-- | src/porting.h | 11 |
2 files changed, 10 insertions, 4 deletions
diff --git a/src/porting.cpp b/src/porting.cpp index b0a1843eb..e7bef1d33 100644 --- a/src/porting.cpp +++ b/src/porting.cpp @@ -23,6 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc., See comments in porting.h */ +#include "porting.h" + #if defined(__APPLE__) #include <mach-o/dyld.h> #include "CoreFoundation/CoreFoundation.h" @@ -37,7 +39,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include <sys/utsname.h> #endif -#include "porting.h" #include "config.h" #include "debug.h" #include "filesys.h" diff --git a/src/porting.h b/src/porting.h index 9024570bd..aaabce4eb 100644 --- a/src/porting.h +++ b/src/porting.h @@ -24,6 +24,14 @@ with this program; if not, write to the Free Software Foundation, Inc., #ifndef PORTING_HEADER #define PORTING_HEADER +#ifdef _WIN32 + #ifdef _WIN32_WINNT + #undef _WIN32_WINNT + #endif + #define _WIN32_WINNT 0x0501 // We need to do this before any other headers + // because those might include sdkddkver.h which defines _WIN32_WINNT if not already set +#endif + #include <string> #include "irrlichttypes.h" // u32 #include "debug.h" @@ -42,9 +50,6 @@ with this program; if not, write to the Free Software Foundation, Inc., //#define ALIGNOF(type) offsetof (alignment_trick<type>, member) #ifdef _WIN32 - #ifndef _WIN32_WINNT - #define _WIN32_WINNT 0x0501 - #endif #include <windows.h> #define sleep_ms(x) Sleep(x) |