Author: cazfi
Date: Thu Oct 29 20:26:40 2015
New Revision: 30303
URL: http://svn.gna.org/viewcvs/freeciv?rev=30303&view=rev
Log:
Look for socklen_t definition from <ws2tcpip.h>.
See patch #6496
Modified:
branches/S2_6/configure.ac
branches/S2_6/utility/netintf.h
Modified: branches/S2_6/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=30303&r1=30302&r2=30303&view=diff
==============================================================================
--- branches/S2_6/configure.ac (original)
+++ branches/S2_6/configure.ac Thu Oct 29 20:26:40 2015
@@ -1121,9 +1121,17 @@
AC_C_CONST
AC_HEADER_TIME
AC_STRUCT_TM
-AC_CHECK_TYPES(socklen_t, [], [],
-[#include <sys/types.h>
+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
dnl Headers that might contain the intptr_t definition found earlier
Modified: branches/S2_6/utility/netintf.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/netintf.h?rev=30303&r1=30302&r2=30303&view=diff
==============================================================================
--- branches/S2_6/utility/netintf.h (original)
+++ branches/S2_6/utility/netintf.h Thu Oct 29 20:26:40 2015
@@ -42,6 +42,9 @@
#endif
#ifdef HAVE_WINSOCK
#include <winsock.h>
+#endif
+#ifdef HAVE_WS2TCPIP_H
+#include <ws2tcpip.h>
#endif
#include "ioz.h"
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
