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

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

diff --git a/src/IOHandler/IOEngine_select.c b/src/IOHandler/IOEngine_select.c
index b725572..3c62c4c 100644
--- a/src/IOHandler/IOEngine_select.c
+++ b/src/IOHandler/IOEngine_select.c
@@ -26,9 +26,12 @@
 #include <string.h>
 #include <stdio.h>
 #ifdef WIN32
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
 #define _WIN32_WINNT 0x501
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 #elif defined HAVE_SYS_SELECT_H
 #include <sys/select.h>
 #endif
diff --git a/src/IOHandler/IOEngine_win32.c b/src/IOHandler/IOEngine_win32.c
index 26ac0a6..0a0a7ac 100644
--- a/src/IOHandler/IOEngine_win32.c
+++ b/src/IOHandler/IOEngine_win32.c
@@ -22,10 +22,12 @@
 #include "IOTimer.h"
 
 #ifdef WIN32
-
+#ifdef _WIN32_WINNT
+#undef _WIN32_WINNT
+#endif
 #define _WIN32_WINNT 0x501
-#include <windows.h>
 #include <winsock2.h>
+#include <windows.h>
 
 /* This is massively kludgy.  Unfortunately, the only performant I/O
  * multiplexer with halfway decent semantics under Windows is