From 9b795de4afdd5669a9000c5d13bec61e51fbba49 Mon Sep 17 00:00:00 2001
From: Steven McCoy <steven.mccoy@miru.hk>
Date: Sat, 18 Jun 2011 20:44:03 +0200
Subject: Refactor Windows versioning and WinSock usage.Signed-off-by: Steven
 McCoy <steven.mccoy@miru.hk>

---
 src/select.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'src/select.cpp')

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"
-- 
cgit v1.2.3