Author: cazfi
Date: Tue May 3 05:15:24 2016
New Revision: 32546
URL: http://svn.gna.org/viewcvs/freeciv?rev=32546&view=rev
Log:
Dropped direct winsock2.h includes from files that get it via fc_prehdrs.h
See patch #7134
Modified:
branches/S2_6/client/client_main.c
branches/S2_6/client/clinet.c
branches/S2_6/client/gui-sdl/gui_main.c
branches/S2_6/client/gui-sdl2/gui_main.c
branches/S2_6/common/connection.c
branches/S2_6/server/meta.c
branches/S2_6/server/sernet.c
branches/S2_6/server/srv_main.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=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/client/client_main.c (original)
+++ branches/S2_6/client/client_main.c Tue May 3 05:15:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -15,13 +15,8 @@
#include <fc_config.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 */
+#include "fc_prehdrs.h"
+
#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=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/client/clinet.c (original)
+++ branches/S2_6/client/clinet.c Tue May 3 05:15:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -55,13 +55,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.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 */
/* utility */
#include "capstr.h"
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=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl/gui_main.c (original)
+++ branches/S2_6/client/gui-sdl/gui_main.c Tue May 3 05:15:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -11,18 +11,20 @@
GNU General Public License for more details.
***********************************************************************/
-/**********************************************************************
+/***********************************************************************
gui_main.c - description
-------------------
begin : Sun Jun 30 2002
copyright : (C) 2002 by RafaÅ Bursig
email : RafaÅ Bursig <bur...@poczta.fm>
- **********************************************************************/
+***********************************************************************/
#ifdef HAVE_CONFIG_H
#include <fc_config.h>
#endif
+#include "fc_prehdrs.h"
+
#include <errno.h>
#ifdef HAVE_LOCALE_H
@@ -32,14 +34,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.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 */
/* 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=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/client/gui-sdl2/gui_main.c (original)
+++ branches/S2_6/client/gui-sdl2/gui_main.c Tue May 3 05:15:24 2016
@@ -23,6 +23,8 @@
#include <fc_config.h>
#endif
+#include "fc_prehdrs.h"
+
#include <errno.h>
#ifdef HAVE_LOCALE_H
@@ -32,14 +34,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.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 */
/* SDL2 */
#ifdef SDL2_PLAIN_INCLUDE
Modified: branches/S2_6/common/connection.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/connection.c?rev=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/common/connection.c (original)
+++ branches/S2_6/common/connection.c Tue May 3 05:15:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -31,14 +31,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.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 */
-
/* utility */
#include "fcintl.h"
Modified: branches/S2_6/server/meta.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/meta.c?rev=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/server/meta.c (original)
+++ branches/S2_6/server/meta.c Tue May 3 05:15:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -38,13 +38,6 @@
#ifdef HAVE_ARPA_INET_H
#include <arpa/inet.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 */
/* 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=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/server/sernet.c (original)
+++ branches/S2_6/server/sernet.c Tue May 3 05:15:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -57,13 +57,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.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 */
/* 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=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c (original)
+++ branches/S2_6/server/srv_main.c Tue May 3 05:15:24 2016
@@ -41,13 +41,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.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 */
/* utility */
#include "astring.h"
Modified: branches/S2_6/utility/netintf.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/netintf.c?rev=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/utility/netintf.c (original)
+++ branches/S2_6/utility/netintf.c Tue May 3 05:15:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -11,9 +11,9 @@
GNU General Public License for more details.
***********************************************************************/
-/**********************************************************************
+/***********************************************************************
Common network interface.
-**********************************************************************/
+***********************************************************************/
#ifdef HAVE_CONFIG_H
#include <fc_config.h>
@@ -45,13 +45,6 @@
#ifdef HAVE_SYS_SIGNAL_H
#include <sys/signal.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> /* GetTempPath */
#endif
Modified: branches/S2_6/utility/netintf.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/netintf.h?rev=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/utility/netintf.h (original)
+++ branches/S2_6/utility/netintf.h Tue May 3 05:15:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -20,7 +20,7 @@
#include <freeciv_config.h>
-/**********************************************************************
+/***********************************************************************
Common network interface.
***********************************************************************/
@@ -45,13 +45,6 @@
#ifdef FREECIV_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 */
/* 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=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/utility/shared.c (original)
+++ branches/S2_6/utility/shared.c Tue May 3 05:15:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -42,13 +42,6 @@
#ifdef HAVE_UNISTD_H
#include <unistd.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=32546&r1=32545&r2=32546&view=diff
==============================================================================
--- branches/S2_6/utility/support.c (original)
+++ branches/S2_6/utility/support.c Tue May 3 05:15:24 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -11,7 +11,7 @@
GNU General Public License for more details.
***********************************************************************/
-/**********************************************************************
+/***********************************************************************
This module contains replacements for functions which are not
available on all platforms. Where the functions are available
natively, these are (mostly) just wrappers.
@@ -35,7 +35,7 @@
The main disadvantage is remembering to use these "fc" functions on
systems which have the functions natively.
-**********************************************************************/
+***********************************************************************/
#ifdef HAVE_CONFIG_H
#include <fc_config.h>
@@ -79,13 +79,6 @@
#ifdef FREECIV_HAVE_LIBZ
#include <zlib.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>
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
