Author: cazfi
Date: Mon Dec 14 16:25:29 2015
New Revision: 31003

URL: http://svn.gna.org/viewcvs/freeciv?rev=31003&view=rev
Log:
Reverted switching from winsock to winsock2 from S2_5 for now.

See patch #6533

Modified:
    branches/S2_5/client/clinet.c
    branches/S2_5/client/gui-sdl/gui_main.c
    branches/S2_5/client/servers.c
    branches/S2_5/common/connection.c
    branches/S2_5/common/dataio.c
    branches/S2_5/common/packets.c
    branches/S2_5/configure.ac
    branches/S2_5/server/meta.c
    branches/S2_5/server/sernet.c
    branches/S2_5/server/srv_main.c
    branches/S2_5/utility/netintf.c
    branches/S2_5/utility/netintf.h
    branches/S2_5/utility/support.c

Modified: branches/S2_5/client/clinet.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/clinet.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/client/clinet.c       (original)
+++ branches/S2_5/client/clinet.c       Mon Dec 14 16:25:29 2015
@@ -54,12 +54,8 @@
 #include <unistd.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 
 /* utility */
 #include "capstr.h"

Modified: branches/S2_5/client/gui-sdl/gui_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/gui-sdl/gui_main.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/client/gui-sdl/gui_main.c     (original)
+++ branches/S2_5/client/gui-sdl/gui_main.c     Mon Dec 14 16:25:29 2015
@@ -34,12 +34,8 @@
 #endif
 
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 
 #include "SDL.h"
 

Modified: branches/S2_5/client/servers.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/client/servers.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/client/servers.c      (original)
+++ branches/S2_5/client/servers.c      Mon Dec 14 16:25:29 2015
@@ -49,12 +49,8 @@
 #include <unistd.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 
 /* dependencies */
 #include "cvercmp.h"

Modified: branches/S2_5/common/connection.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/connection.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/common/connection.c   (original)
+++ branches/S2_5/common/connection.c   Mon Dec 14 16:25:29 2015
@@ -30,12 +30,8 @@
 #include <unistd.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 
 /* utility */
 #include "fcintl.h"

Modified: branches/S2_5/common/dataio.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/dataio.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/common/dataio.c       (original)
+++ branches/S2_5/common/dataio.c       Mon Dec 14 16:25:29 2015
@@ -43,12 +43,8 @@
 #include <arpa/inet.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 
 /* utility */
 #include "bitvector.h"

Modified: branches/S2_5/common/packets.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/common/packets.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/common/packets.c      (original)
+++ branches/S2_5/common/packets.c      Mon Dec 14 16:25:29 2015
@@ -27,12 +27,8 @@
 #include <netinet/in.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 
 /* utility */
 #include "capability.h"

Modified: branches/S2_5/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/configure.ac?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/configure.ac  (original)
+++ branches/S2_5/configure.ac  Mon Dec 14 16:25:29 2015
@@ -667,10 +667,8 @@
     AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - Mingw32])
     AC_DEFINE([WIN32_NATIVE], [1], [Mingw32-specific setting - native])
     AC_DEFINE([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])
-    dnl Without WINSOCK2, use: LIBS="$LIBS -lwsock32"
-    LIBS="${LIBS} -lws2_32"
+    LIBS="$LIBS -lwsock32"
     ;;
 
   *skyos*)

Modified: branches/S2_5/server/meta.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/meta.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/server/meta.c (original)
+++ branches/S2_5/server/meta.c Mon Dec 14 16:25:29 2015
@@ -37,12 +37,8 @@
 #include <arpa/inet.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 
 /* utility */
 #include "fcintl.h"

Modified: branches/S2_5/server/sernet.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/sernet.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/server/sernet.c       (original)
+++ branches/S2_5/server/sernet.c       Mon Dec 14 16:25:29 2015
@@ -56,12 +56,8 @@
 #include <unistd.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 
 /* utility */
 #include "capability.h"

Modified: branches/S2_5/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/srv_main.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/server/srv_main.c     (original)
+++ branches/S2_5/server/srv_main.c     Mon Dec 14 16:25:29 2015
@@ -40,12 +40,8 @@
 #include <unistd.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 
 /* utility */
 #include "astring.h"

Modified: branches/S2_5/utility/netintf.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/netintf.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/utility/netintf.c     (original)
+++ branches/S2_5/utility/netintf.c     Mon Dec 14 16:25:29 2015
@@ -44,12 +44,8 @@
 #include <sys/signal.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 #ifdef WIN32_NATIVE
 #include <windows.h>   /* GetTempPath */
 #endif

Modified: branches/S2_5/utility/netintf.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/netintf.h?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/utility/netintf.h     (original)
+++ branches/S2_5/utility/netintf.h     Mon Dec 14 16:25:29 2015
@@ -41,12 +41,8 @@
 #include <unistd.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 
 /* utility */
 #include "ioz.h"

Modified: branches/S2_5/utility/support.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/utility/support.c?rev=31003&r1=31002&r2=31003&view=diff
==============================================================================
--- branches/S2_5/utility/support.c     (original)
+++ branches/S2_5/utility/support.c     Mon Dec 14 16:25:29 2015
@@ -82,12 +82,8 @@
 #include <windows.h>
 #endif
 #ifdef HAVE_WINSOCK
-#ifdef HAVE_WINSOCK2
-#include <winsock2.h>
-#else  /* HAVE_WINSOCK2 */
 #include <winsock.h>
-#endif /* HAVE_WINSOCK2 */
-#endif /* HAVE_WINSOCK */
+#endif
 #ifdef HAVE_STRINGS_H
 #  include <strings.h>
 #endif


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

Reply via email to