Merge pull request #98 from zeromq/revert-95-patch-1

Revert "update minimum _WIN32_WINNT version to 0x0600 for 4.1.4 onwards"
This commit is contained in:
Pieter Hintjens 2016-02-11 14:16:39 +01:00
commit ad7fe55e95

View File

@ -37,15 +37,18 @@
#define NOMINMAX // Macros min(a,b) and max(a,b) #define NOMINMAX // Macros min(a,b) and max(a,b)
#endif #endif
// Set target version to Windows Vista or higher, required by if_nametoindex // Set target version to Windows Server 2003, Windows XP/SP1 or higher.
#ifndef _WIN32_WINNT #ifndef _WIN32_WINNT
#define _WIN32_WINNT 0x0600 #define _WIN32_WINNT 0x0501
#endif #endif
#if(_WIN32_WINNT >= 0x0600) #ifdef __MINGW32__
// Require Windows XP or higher with MinGW for getaddrinfo().
#if(_WIN32_WINNT >= 0x0501)
#else #else
#undef _WIN32_WINNT #undef _WIN32_WINNT
#define _WIN32_WINNT 0x0600 #define _WIN32_WINNT 0x0501
#endif
#endif #endif
#include <winsock2.h> #include <winsock2.h>