Merge remote-tracking branch 'remotes/IOMultiplexer/v2'

diff --git a/src/IOHandler/IODNSEngine_default.c b/src/IOHandler/IODNSEngine_default.c
index b8189272c7b8c7ed838f1fbb082dfdbb996f5f9d..f27ef94d3dff4d98cfddd16441a8fb740cd6c663 100644 (file)
--- a/src/IOHandler/IODNSEngine_default.c
+++ b/src/IOHandler/IODNSEngine_default.c
@@ -21,9 +21,12 @@
 #include "IODNSLookup.h"
 
 #ifdef WIN32
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
 #define _WIN32_WINNT 0x501
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #include <ws2tcpip.h>
 #else
 #include <sys/types.h>

diff --git a/src/IOHandler/IOSockets.c b/src/IOHandler/IOSockets.c
index a361126b5540dd10a69160587c9fcfca49bc597c..0f4dfb4fb52bcd15e5b214719236bc937a3c9d00 100644 (file)
--- a/src/IOHandler/IOSockets.c
+++ b/src/IOHandler/IOSockets.c
@@ -23,9 +23,12 @@
 #include "IOSSLBackend.h"
 
 #ifdef WIN32
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
 #define _WIN32_WINNT 0x501
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #include <ws2tcpip.h>
 #else
 #include <sys/socket.h>