From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Fri, 9 Apr 2010 18:59:41 +0000 (+0000)
Subject: patch from Ozkan Sezer for compatibility with mingw64 (changed #include
X-Git-Tag: xonotic-v0.1.0preview~230^2~395
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=7bbad4b218ce0d4d73ade493cb9baf495112f39d;p=xonotic%2Fdarkplaces.git

patch from Ozkan Sezer for compatibility with mingw64 (changed #include
order)


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@10074 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/lhnet.c b/lhnet.c
index 5d60a213..99b9f144 100644
--- a/lhnet.c
+++ b/lhnet.c
@@ -1,17 +1,17 @@
 
 // Written by Forest Hale 2003-06-15 and placed into public domain.
 
-#ifdef SUPPORTIPV6
 #ifdef WIN32
+# ifdef SUPPORTIPV6
 // Windows XP or higher is required for getaddrinfo, but the inclusion of wspiapi provides fallbacks for older versions
 # define _WIN32_WINNT 0x0501
+# endif
 # include <winsock2.h>
 # include <ws2tcpip.h>
 # ifdef USE_WSPIAPI_H
 #  include <wspiapi.h>
 # endif
 #endif
-#endif
 
 #ifndef STANDALONETEST
 #include "quakedef.h"
@@ -21,10 +21,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <string.h>
-#ifdef WIN32
-#include <winsock2.h>
-#include <ws2tcpip.h>
-#else
+#ifndef WIN32
 #include <unistd.h>
 #include <sys/types.h>
 #include <sys/socket.h>