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/windows.hpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/windows.hpp')

diff --git a/src/windows.hpp b/src/windows.hpp
index 5133875..fadee61 100644
--- a/src/windows.hpp
+++ b/src/windows.hpp
@@ -24,7 +24,6 @@
 // The purpose of this header file is to turn on only the items actually needed
 // on the windows platform.
 
-#define _WINSOCKAPI_
 #ifndef NOMINMAX
 #define NOMINMAX // No min and max functions, these clash with C++.
 #endif
@@ -50,11 +49,10 @@
 #ifdef WINVER
 #undef WINVER
 #endif
+//  Default to Windows Server 2003, Windows XP
 #define WINVER 0x0501
 #endif
 
-#include <windows.h>
-
 //  MSVC++ 2005 on Win2000 does not define _WIN32_WINNT.
 #ifndef _WIN32_WINNT
 #define _WIN32_WINNT WINVER
@@ -68,6 +66,7 @@
 #include <winsock.h>
 #endif
 
+#include <windows.h>
 #include <ws2tcpip.h>
 #include <ipexport.h>
 #include <process.h>
-- 
cgit v1.2.3