diff options
| author | Rémi Verschelde <remi@verschelde.fr> | 2021-07-05 14:15:24 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-05 14:15:24 +0200 |
| commit | ffab3949e365598271e50705e358864eecfb64d8 (patch) | |
| tree | 2dcbc96aeca1c60fe598055c10087e7ebfe5603e /drivers | |
| parent | d3c972683542365b1a9bf2d96d20520a8981612d (diff) | |
| parent | 257a8a337e77a3b0a6d79b7846bb33b7887538cf (diff) | |
Merge pull request #50048 from Calinou/remove-travis-code
Remove unused code related to Travis CI
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/unix/ip_unix.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/unix/ip_unix.cpp b/drivers/unix/ip_unix.cpp index e8f8ae4717..8a880ab9c8 100644 --- a/drivers/unix/ip_unix.cpp +++ b/drivers/unix/ip_unix.cpp @@ -41,19 +41,7 @@ #include <windows.h> #include <ws2tcpip.h> #ifndef UWP_ENABLED -#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 // Re-enable Vista API -#else -#include <iphlpapi.h> -#endif // MINGW hack #endif #else // UNIX #include <netdb.h> |