From b164023cca3f29c5eb371a8a0757c98ae4683ae4 Mon Sep 17 00:00:00 2001
From: Steven McCoy <steven.mccoy@miru.hk>
Date: Sun, 12 Jun 2011 19:37:11 +0200
Subject: Fix scope on Windows includes.

Fix windows.h included before winsock2.h.
Remove definition of _WINSOCKAPI_.

Signed-off-by: Steven McCoy <steven.mccoy@miru.hk>
---
 src/ctx.cpp | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/ctx.cpp')

diff --git a/src/ctx.cpp b/src/ctx.cpp
index fb5420d..6d6242e 100644
--- a/src/ctx.cpp
+++ b/src/ctx.cpp
@@ -31,9 +31,13 @@
 #include "msg.hpp"
 
 #if defined ZMQ_HAVE_WINDOWS
-#include "windows.h"
+#ifndef WIN32_LEAN_AND_MEAN
+#define WIN32_LEAN_AND_MEAN
+#endif
+#include <winsock2.h>
+#include <windows.h>
 #else
-#include "unistd.h"
+#include <unistd.h>
 #endif
 
 zmq::ctx_t::ctx_t (uint32_t io_threads_) :
-- 
cgit v1.2.3