Author: cazfi
Date: Sun Nov  1 19:56:47 2015
New Revision: 30361

URL: http://svn.gna.org/viewcvs/freeciv?rev=30361&view=rev
Log:
Do not include <ws2tcpip.h>, mostly reverting patch #6496

See bug #24000

Modified:
    branches/S2_5/configure.ac
    branches/S2_5/utility/netintf.h

Modified: branches/S2_5/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/configure.ac?rev=30361&r1=30360&r2=30361&view=diff
==============================================================================
--- branches/S2_5/configure.ac  (original)
+++ branches/S2_5/configure.ac  Sun Nov  1 19:56:47 2015
@@ -1138,16 +1138,12 @@
 AC_C_CONST
 AC_HEADER_TIME
 AC_STRUCT_TM
-AC_CHECK_HEADERS([ws2tcpip.h])
 AC_CHECK_TYPES([socklen_t], [], [],
 [#ifdef HAVE_SYS_TYPES_H
 #include <sys/types.h>
 #endif
 #ifdef HAVE_SYS_SOCKET_H
 #include <sys/socket.h>
-#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
 #endif
 ])
 AC_TYPE_INTPTR_T

Modified: branches/S2_5/utility/netintf.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/netintf.h?rev=30361&r1=30360&r2=30361&view=diff
==============================================================================
--- branches/S2_5/utility/netintf.h     (original)
+++ branches/S2_5/utility/netintf.h     Sun Nov  1 19:56:47 2015
@@ -43,10 +43,8 @@
 #ifdef HAVE_WINSOCK
 #include <winsock.h>
 #endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
 
+/* utility */
 #include "ioz.h"
 #include "support.h"            /* bool type */
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to