Author: cazfi
Date: Sun Nov 15 14:39:09 2015
New Revision: 30614
URL: http://svn.gna.org/viewcvs/freeciv?rev=30614&view=rev
Log:
Use winsock2 on Windows builds.
See patch #6533
Modified:
trunk/client/clinet.c
trunk/client/gui-sdl2/gui_main.c
trunk/client/servers.c
trunk/common/connection.c
trunk/common/dataio.c
trunk/common/dataio_json.c
trunk/common/packets.c
trunk/configure.ac
trunk/gen_headers/freeciv_config.h.in
trunk/server/meta.c
trunk/server/sernet.c
trunk/server/srv_main.c
trunk/utility/netintf.c
trunk/utility/netintf.h
trunk/utility/support.c
Modified: trunk/client/clinet.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/clinet.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/client/clinet.c (original)
+++ trunk/client/clinet.c Sun Nov 15 14:39:09 2015
@@ -57,7 +57,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* utility */
Modified: trunk/client/gui-sdl2/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/gui_main.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/client/gui-sdl2/gui_main.c (original)
+++ trunk/client/gui-sdl2/gui_main.c Sun Nov 15 14:39:09 2015
@@ -37,7 +37,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* SDL */
Modified: trunk/client/servers.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/servers.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/client/servers.c (original)
+++ trunk/client/servers.c Sun Nov 15 14:39:09 2015
@@ -52,7 +52,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* dependencies */
Modified: trunk/common/connection.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/connection.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/common/connection.c (original)
+++ trunk/common/connection.c Sun Nov 15 14:39:09 2015
@@ -33,7 +33,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* utility */
Modified: trunk/common/dataio.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/dataio.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/common/dataio.c (original)
+++ trunk/common/dataio.c Sun Nov 15 14:39:09 2015
@@ -46,7 +46,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* utility */
Modified: trunk/common/dataio_json.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/dataio_json.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/common/dataio_json.c (original)
+++ trunk/common/dataio_json.c Sun Nov 15 14:39:09 2015
@@ -47,7 +47,11 @@
#include <arpa/inet.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* utility */
Modified: trunk/common/packets.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/common/packets.c (original)
+++ trunk/common/packets.c Sun Nov 15 14:39:09 2015
@@ -30,7 +30,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* utility */
Modified: trunk/configure.ac
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Sun Nov 15 14:39:09 2015
@@ -647,8 +647,10 @@
AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - Mingw32])
AC_DEFINE([WIN32_NATIVE], [1], [Mingw32-specific setting - native])
AC_DEFINE([FREECIV_HAVE_WINSOCK], [1], [Mingw32-specific setting -
winsock])
+ AC_DEFINE([FREECIV_HAVE_WINSOCK2], [1], [Mingw32-specific setting -
winsock2])
AC_DEFINE([NONBLOCKING_SOCKETS], [1], [nonblocking sockets support])
- LIBS="$LIBS -lwsock32"
+ dnl Without WINSOCK2, use: LIBS="$LIBS -lwsock32"
+ LIBS="${LIBS} -lws2_32"
;;
*skyos*)
Modified: trunk/gen_headers/freeciv_config.h.in
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/gen_headers/freeciv_config.h.in?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/gen_headers/freeciv_config.h.in (original)
+++ trunk/gen_headers/freeciv_config.h.in Sun Nov 15 14:39:09 2015
@@ -83,8 +83,11 @@
/* jansson network protocol in use */
#undef FREECIV_JSON_CONNECTION
-/* uses winsock */
+/* uses some winsock version */
#undef FREECIV_HAVE_WINSOCK
+
+/* uses winsock2 */
+#undef FREECIV_HAVE_WINSOCK2
/* Extra debugging support */
#undef FREECIV_DEBUG
Modified: trunk/server/meta.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/meta.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/server/meta.c (original)
+++ trunk/server/meta.c Sun Nov 15 14:39:09 2015
@@ -40,7 +40,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* utility */
Modified: trunk/server/sernet.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/sernet.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/server/sernet.c (original)
+++ trunk/server/sernet.c Sun Nov 15 14:39:09 2015
@@ -59,7 +59,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* utility */
Modified: trunk/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/server/srv_main.c (original)
+++ trunk/server/srv_main.c Sun Nov 15 14:39:09 2015
@@ -43,7 +43,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* utility */
Modified: trunk/utility/netintf.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/utility/netintf.c (original)
+++ trunk/utility/netintf.c Sun Nov 15 14:39:09 2015
@@ -47,7 +47,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
#ifdef WIN32_NATIVE
#include <windows.h> /* GetTempPath */
Modified: trunk/utility/netintf.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.h?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/utility/netintf.h (original)
+++ trunk/utility/netintf.h Sun Nov 15 14:39:09 2015
@@ -46,7 +46,11 @@
#include <ws2tcpip.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
/* utility */
Modified: trunk/utility/support.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/utility/support.c?rev=30614&r1=30613&r2=30614&view=diff
==============================================================================
--- trunk/utility/support.c (original)
+++ trunk/utility/support.c Sun Nov 15 14:39:09 2015
@@ -85,7 +85,11 @@
#include <windows.h>
#endif
#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else
#include <winsock.h>
+#endif
#endif
#ifdef HAVE_STRINGS_H
# include <strings.h>
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
