From: pk910 <philipp@zoelle1.de>
Date: Tue, 15 Jul 2014 19:55:02 +0000 (+0200)
Subject: Merge remote-tracking branch 'remotes/IOMultiplexer/v2'
X-Git-Url: http://git.pk910.de/?p=NextIRCd.git;a=commitdiff_plain;h=0bb25632059f08840c6ea94fbdd0fe329ffac383;hp=5d007c88c604159ec55555d7726951ac1c0ea2cf

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

diff --git a/src/IOHandler/IODNSEngine_default.c b/src/IOHandler/IODNSEngine_default.c
index b818927..f27ef94 100644
--- 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 a361126..0f4dfb4 100644
--- 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>