lisacvuk
/
Minetest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix problem with newer MinGW runtimes

master
Sfan5 2014-04-14 18:03:28 +02:00
parent dcafad2f73
commit d436502fa4
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/porting.cpp
View File

@ -23,6 +23,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
See comments in porting.h See comments in porting.h
*/ */
#include "porting.h"
#if defined(__APPLE__) #if defined(__APPLE__)
#include <mach-o/dyld.h> #include <mach-o/dyld.h>
#include "CoreFoundation/CoreFoundation.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> #include <sys/utsname.h>
#endif #endif
#include "porting.h"
#include "config.h" #include "config.h"
#include "debug.h" #include "debug.h"
#include "filesys.h" #include "filesys.h"

11
src/porting.h
View File

@ -24,6 +24,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#ifndef PORTING_HEADER #ifndef PORTING_HEADER
#define 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 <string>
#include "irrlichttypes.h" // u32 #include "irrlichttypes.h" // u32
#include "debug.h" #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) //#define ALIGNOF(type) offsetof (alignment_trick<type>, member)
#ifdef _WIN32 #ifdef _WIN32
#ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0501
#endif
#include <windows.h> #include <windows.h>
#define sleep_ms(x) Sleep(x) #define sleep_ms(x) Sleep(x)