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

diff --git a/src/IOHandler/IOEngine_select.c b/src/IOHandler/IOEngine_select.c
index b725572067b32c213e5cd62894b1021a43710ec3..3c62c4c96e3dced7c8eda56c0bcc64c90a424cad 100644 (file)
--- 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 26ac0a64d6f484e38efeeb1112eb777d661cee18..0a0a7acf73c86a31ca2b4a6e0bcadf36cf95d5d7 100644 (file)
--- 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