godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7480 from godotengine/ip-mingw2-workaround2 

Windows: Workaround missing includes in MinGW-w64 < 4
This commit is contained in:
Rémi Verschelde 2017-01-09 12:46:33 +01:00 committed by GitHub
parent 74c63fc378 b24fe6879a
commit 0e635b683b
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/unix/ip_unix.cpp
View File

@ -42,7 +42,19 @@
#include <windows.h>
#include <stdio.h>
#ifndef UWP_ENABLED
#include <iphlpapi.h>
#if defined(__MINGW32__ ) && (!defined(__MINGW64_VERSION_MAJOR) || __MINGW64_VERSION_MAJOR < 4)
// MinGW-w64 on Ubuntu 12.04 (our Travis build env) has bugs in this code where
// some includes are missing in dependencies of iphlpapi.h for WINVER >= 0x0600 (Vista).
// We don't use this Vista code for now, so working it around by disabling it.
// MinGW-w64 >= 4.0 seems to be better judging by its headers.
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0501 // Windows XP, disable Vista API
#include <iphlpapi.h>
#undef _WIN32_WINNT
#define _WIN32_WINNT 0x0600 // Reenable Vista API
#else
#include <iphlpapi.h>
#endif // MINGW hack
#endif
#else
#include <netdb.h>