Author: cazfi
Date: Tue Jan 5 16:48:10 2016
New Revision: 31367
URL: http://svn.gna.org/viewcvs/freeciv?rev=31367&view=rev
Log:
Removed unnecessary <ws2tcpip.h> includes
See patch #6780
Modified:
branches/S2_6/client/client_main.c
branches/S2_6/client/clinet.c
branches/S2_6/client/connectdlg_common.c
branches/S2_6/client/gui-sdl/gui_main.c
branches/S2_6/client/gui-sdl2/gui_main.c
branches/S2_6/client/servers.c
branches/S2_6/common/connection.c
branches/S2_6/common/dataio.c
branches/S2_6/common/packets.c
branches/S2_6/server/civserver.c
branches/S2_6/server/meta.c
branches/S2_6/server/sernet.c
branches/S2_6/server/srv_main.c
branches/S2_6/utility/ioz.c
branches/S2_6/utility/netintf.c
branches/S2_6/utility/netintf.h
branches/S2_6/utility/shared.c
branches/S2_6/utility/support.c
Modified: branches/S2_6/client/client_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/client_main.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/client/client_main.c (original)
+++ branches/S2_6/client/client_main.c Tue Jan 5 16:48:10 2016
@@ -15,9 +15,13 @@
#include <fc_config.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
+#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else /* FREECIV_HAVE_WINSOCK2 */
+#include <winsock.h>
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
#ifdef WIN32_NATIVE
#include <windows.h> /* LoadLibrary() */
#endif
Modified: branches/S2_6/client/clinet.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/clinet.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/client/clinet.c (original)
+++ branches/S2_6/client/clinet.c Tue Jan 5 16:48:10 2016
@@ -53,16 +53,13 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
/* utility */
#include "capstr.h"
Modified: branches/S2_6/client/connectdlg_common.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/connectdlg_common.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/client/connectdlg_common.c (original)
+++ branches/S2_6/client/connectdlg_common.c Tue Jan 5 16:48:10 2016
@@ -20,9 +20,13 @@
#include <string.h>
#include <time.h>
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
+#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else /* FREECIV_HAVE_WINSOCK2 */
+#include <winsock.h>
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
#ifdef WIN32_NATIVE
#include <windows.h>
#endif
Modified: branches/S2_6/client/gui-sdl/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl/gui_main.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/gui_main.c (original)
+++ branches/S2_6/client/gui-sdl/gui_main.c Tue Jan 5 16:48:10 2016
@@ -33,16 +33,13 @@
#include <unistd.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
/* SDL */
#include <SDL/SDL.h>
Modified: branches/S2_6/client/gui-sdl2/gui_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/gui-sdl2/gui_main.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/gui_main.c (original)
+++ branches/S2_6/client/gui-sdl2/gui_main.c Tue Jan 5 16:48:10 2016
@@ -33,16 +33,13 @@
#include <unistd.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
/* SDL2 */
#include <SDL2/SDL.h>
Modified: branches/S2_6/client/servers.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/servers.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/client/servers.c (original)
+++ branches/S2_6/client/servers.c Tue Jan 5 16:48:10 2016
@@ -48,16 +48,13 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
/* dependencies */
#include "cvercmp.h"
Modified: branches/S2_6/common/connection.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/connection.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/common/connection.c (original)
+++ branches/S2_6/common/connection.c Tue Jan 5 16:48:10 2016
@@ -29,16 +29,14 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
+
/* utility */
#include "fcintl.h"
Modified: branches/S2_6/common/dataio.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/dataio.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/common/dataio.c (original)
+++ branches/S2_6/common/dataio.c Tue Jan 5 16:48:10 2016
@@ -42,16 +42,13 @@
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
/* utility */
#include "bitvector.h"
Modified: branches/S2_6/common/packets.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/common/packets.c (original)
+++ branches/S2_6/common/packets.c Tue Jan 5 16:48:10 2016
@@ -26,16 +26,13 @@
#ifdef HAVE_NETINET_IN_H
#include <netinet/in.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
/* utility */
#include "capability.h"
Modified: branches/S2_6/server/civserver.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/civserver.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/server/civserver.c (original)
+++ branches/S2_6/server/civserver.c Tue Jan 5 16:48:10 2016
@@ -32,9 +32,13 @@
#include <Dialogs.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
+#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else /* FREECIV_HAVE_WINSOCK2 */
+#include <winsock.h>
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
#ifdef WIN32_NATIVE
#include <windows.h>
#endif
Modified: branches/S2_6/server/meta.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/meta.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/server/meta.c (original)
+++ branches/S2_6/server/meta.c Tue Jan 5 16:48:10 2016
@@ -36,16 +36,13 @@
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
/* utility */
#include "fcintl.h"
Modified: branches/S2_6/server/sernet.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/sernet.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/server/sernet.c (original)
+++ branches/S2_6/server/sernet.c Tue Jan 5 16:48:10 2016
@@ -55,16 +55,13 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
/* utility */
#include "capability.h"
Modified: branches/S2_6/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c (original)
+++ branches/S2_6/server/srv_main.c Tue Jan 5 16:48:10 2016
@@ -39,16 +39,13 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
/* utility */
#include "astring.h"
Modified: branches/S2_6/utility/ioz.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/ioz.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/utility/ioz.c (original)
+++ branches/S2_6/utility/ioz.c Tue Jan 5 16:48:10 2016
@@ -38,9 +38,13 @@
#include <stdio.h>
#include <string.h>
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
+#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else /* FREECIV_HAVE_WINSOCK2 */
+#include <winsock.h>
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
#ifdef FREECIV_HAVE_LIBZ
#include <zlib.h>
Modified: branches/S2_6/utility/netintf.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/netintf.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/utility/netintf.c (original)
+++ branches/S2_6/utility/netintf.c Tue Jan 5 16:48:10 2016
@@ -43,16 +43,13 @@
#ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
#ifdef WIN32_NATIVE
#include <windows.h> /* GetTempPath */
#endif
Modified: branches/S2_6/utility/netintf.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/netintf.h?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/utility/netintf.h (original)
+++ branches/S2_6/utility/netintf.h Tue Jan 5 16:48:10 2016
@@ -48,10 +48,10 @@
#ifdef FREECIV_HAVE_WINSOCK
#ifdef FREECIV_HAVE_WINSOCK2
#include <winsock2.h>
-#else
+#else /* FREECIV_HAVE_WINSOCK2 */
#include <winsock.h>
-#endif
-#endif
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
/* utility */
#include "ioz.h"
Modified: branches/S2_6/utility/shared.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/shared.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/utility/shared.c (original)
+++ branches/S2_6/utility/shared.c Tue Jan 5 16:48:10 2016
@@ -40,9 +40,13 @@
#ifdef HAVE_UNISTD_H
#include <unistd.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
+#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else /* FREECIV_HAVE_WINSOCK2 */
+#include <winsock.h>
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
#ifdef WIN32_NATIVE
#include <windows.h>
#include <lmcons.h> /* UNLEN */
Modified: branches/S2_6/utility/support.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/support.c?rev=31367&r1=31366&r2=31367&view=diff
==============================================================================
--- branches/S2_6/utility/support.c (original)
+++ branches/S2_6/utility/support.c Tue Jan 5 16:48:10 2016
@@ -77,19 +77,16 @@
#ifdef FREECIV_HAVE_LIBZ
#include <zlib.h>
#endif
-#ifdef HAVE_WS2TCPIP_H
-#include <ws2tcpip.h>
-#endif
+#ifdef FREECIV_HAVE_WINSOCK
+#ifdef FREECIV_HAVE_WINSOCK2
+#include <winsock2.h>
+#else /* FREECIV_HAVE_WINSOCK2 */
+#include <winsock.h>
+#endif /* FREECIV_HAVE_WINSOCK2 */
+#endif /* FREECIV_HAVE_WINSOCK */
#ifdef WIN32_NATIVE
#include <process.h>
#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
