summaryrefslogtreecommitdiff
path: root/src/select.cpp
diff options
context:
space:
mode:
authorSteven McCoy <steven.mccoy@miru.hk>2011-06-18 20:44:03 +0200
committerMartin Sustrik <sustrik@250bpm.com>2011-06-18 20:44:03 +0200
commit9b795de4afdd5669a9000c5d13bec61e51fbba49 (patch)
tree6c3cdf97dd7a9529a80cf4c8c0f9160e1f7e7bce /src/select.cpp
parentdc66053530e798dbcdb236cc2040031980cc09c7 (diff)
Refactor Windows versioning and WinSock usage.Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
Diffstat (limited to 'src/select.cpp')
-rw-r--r--src/select.cpp11
1 files changed, 5 insertions, 6 deletions
diff --git a/src/select.cpp b/src/select.cpp
index 35d8bd8..5d5ce5d 100644
--- a/src/select.cpp
+++ b/src/select.cpp
@@ -19,12 +19,8 @@
*/
#include "platform.hpp"
-
-#include <string.h>
-#include <algorithm>
-
-#ifdef ZMQ_HAVE_WINDOWS
-#include "winsock2.h"
+#if defined ZMQ_HAVE_WINDOWS
+#include "windows.hpp"
#elif defined ZMQ_HAVE_HPUX
#include <sys/param.h>
#include <sys/types.h>
@@ -36,6 +32,9 @@
#include <sys/select.h>
#endif
+#include <string.h>
+#include <algorithm>
+
#include "select.hpp"
#include "err.hpp"
#include "config.hpp"