Author: cazfi
Date: Sun Jan 31 12:11:52 2016
New Revision: 31685

URL: http://svn.gna.org/viewcvs/freeciv?rev=31685&view=rev
Log:
Include fc_prehdrs.h where needed

See patch #6862

Modified:
    trunk/client/clinet.c
    trunk/client/connectdlg_common.c
    trunk/client/servers.c
    trunk/common/connection.c
    trunk/server/civserver.c
    trunk/server/meta.c
    trunk/server/sernet.c
    trunk/server/srv_main.c
    trunk/tools/download.c
    trunk/tools/modinst.c
    trunk/utility/bitvector.c
    trunk/utility/capability.c
    trunk/utility/fcbacktrace.c
    trunk/utility/fcthread.h
    trunk/utility/netintf.c
    trunk/utility/shared.c
    trunk/utility/support.c

Modified: trunk/client/clinet.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/clinet.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/client/clinet.c       (original)
+++ trunk/client/clinet.c       Sun Jan 31 12:11:52 2016
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <errno.h>
 #include <stdio.h>

Modified: trunk/client/connectdlg_common.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/connectdlg_common.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/client/connectdlg_common.c    (original)
+++ trunk/client/connectdlg_common.c    Sun Jan 31 12:11:52 2016
@@ -14,19 +14,14 @@
 #include <fc_config.h>
 #endif
 
+#include "fc_prehdrs.h"
+
 #include <fcntl.h>
 #include <stdio.h>
 #include <signal.h>             /* SIGTERM and kill */
 #include <string.h>
 #include <time.h>
 
-#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: trunk/client/servers.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/client/servers.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/client/servers.c      (original)
+++ trunk/client/servers.c      Sun Jan 31 12:11:52 2016
@@ -15,6 +15,8 @@
 #include <fc_config.h>
 #endif
 
+#include "fc_prehdrs.h"
+
 #include <errno.h>
 #include <stdlib.h>
 
@@ -48,13 +50,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 */
 
 /* dependencies */
 #include "cvercmp.h"

Modified: trunk/common/connection.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/connection.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/common/connection.c   (original)
+++ trunk/common/connection.c   Sun Jan 31 12:11:52 2016
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <errno.h>
 #include <string.h>

Modified: trunk/server/civserver.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/civserver.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/server/civserver.c    (original)
+++ trunk/server/civserver.c    Sun Jan 31 12:11:52 2016
@@ -15,6 +15,8 @@
 #include <fc_config.h>
 #endif
 
+#include "fc_prehdrs.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -32,13 +34,6 @@
 #include <Dialogs.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: trunk/server/meta.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/meta.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/server/meta.c (original)
+++ trunk/server/meta.c Sun Jan 31 12:11:52 2016
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <ctype.h>
 #include <errno.h>

Modified: trunk/server/sernet.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/sernet.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/server/sernet.c       (original)
+++ trunk/server/sernet.c       Sun Jan 31 12:11:52 2016
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <errno.h>
 #include <stdio.h>

Modified: trunk/server/srv_main.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/server/srv_main.c     (original)
+++ trunk/server/srv_main.c     Sun Jan 31 12:11:52 2016
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <ctype.h>
 #include <stdio.h>

Modified: trunk/tools/download.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/download.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/tools/download.c      (original)
+++ trunk/tools/download.c      Sun Jan 31 12:11:52 2016
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #ifdef FREECIV_HAVE_SYS_TYPES_H
 #include <sys/types.h>

Modified: trunk/tools/modinst.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/tools/modinst.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/tools/modinst.c       (original)
+++ trunk/tools/modinst.c       Sun Jan 31 12:11:52 2016
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 /* utility */
 #include "fciconv.h"

Modified: trunk/utility/bitvector.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/bitvector.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/utility/bitvector.c   (original)
+++ trunk/utility/bitvector.c   Sun Jan 31 12:11:52 2016
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <errno.h>
 #include <stdarg.h>

Modified: trunk/utility/capability.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/capability.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/utility/capability.c  (original)
+++ trunk/utility/capability.c  Sun Jan 31 12:11:52 2016
@@ -15,8 +15,11 @@
 #include <fc_config.h>
 #endif
 
+#include "fc_prehdrs.h"
+
 #include <string.h>
 
+/* utility */
 #include "shared.h"            /* TRUE, FALSE */
 #include "support.h"           /* fc_is* */
 

Modified: trunk/utility/fcbacktrace.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/fcbacktrace.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/utility/fcbacktrace.c (original)
+++ trunk/utility/fcbacktrace.c Sun Jan 31 12:11:52 2016
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif /* HAVE_CONFIG_H */
+
+#include "fc_prehdrs.h"
 
 #ifdef HAVE_EXECINFO_H
 #include <execinfo.h>

Modified: trunk/utility/fcthread.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/fcthread.h?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/utility/fcthread.h    (original)
+++ trunk/utility/fcthread.h    Sun Jan 31 12:11:52 2016
@@ -23,16 +23,6 @@
 
 /* utility */
 #include "support.h" /* bool */
-
-/* No way needed by threading, but if the one including us will ever need it,
- * it can't be included after we have included <windows.h> directly or 
indirectly. */
-#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_TINYCTHR
 #include "tinycthread.h"

Modified: trunk/utility/netintf.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/utility/netintf.c     (original)
+++ trunk/utility/netintf.c     Sun Jan 31 12:11:52 2016
@@ -18,6 +18,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <errno.h>
 #include <signal.h>

Modified: trunk/utility/shared.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/utility/shared.c      (original)
+++ trunk/utility/shared.c      Sun Jan 31 12:11:52 2016
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #ifdef FREECIV_HAVE_SYS_TYPES_H
 /* Under Mac OS X sys/types.h must be included before dirent.h */

Modified: trunk/utility/support.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/support.c?rev=31685&r1=31684&r2=31685&view=diff
==============================================================================
--- trunk/utility/support.c     (original)
+++ trunk/utility/support.c     Sun Jan 31 12:11:52 2016
@@ -40,6 +40,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <ctype.h>
 #include <errno.h>


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

Reply via email to