Author: cazfi
Date: Fri Jan 29 00:41:43 2016
New Revision: 31660
URL: http://svn.gna.org/viewcvs/freeciv?rev=31660&view=rev
Log:
Include fc_prehdrs.h where needed
See patch #6862
Modified:
branches/S2_6/client/clinet.c
branches/S2_6/client/connectdlg_common.c
branches/S2_6/client/servers.c
branches/S2_6/common/connection.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/tools/download.c
branches/S2_6/tools/modinst.c
branches/S2_6/utility/bitvector.c
branches/S2_6/utility/capability.c
branches/S2_6/utility/fcbacktrace.c
branches/S2_6/utility/fcthread.h
branches/S2_6/utility/netintf.c
branches/S2_6/utility/shared.c
branches/S2_6/utility/support.c
Modified: branches/S2_6/client/clinet.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/clinet.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/client/clinet.c (original)
+++ branches/S2_6/client/clinet.c Fri Jan 29 00:41:43 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: branches/S2_6/client/connectdlg_common.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/connectdlg_common.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/client/connectdlg_common.c (original)
+++ branches/S2_6/client/connectdlg_common.c Fri Jan 29 00:41:43 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: branches/S2_6/client/servers.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/servers.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/client/servers.c (original)
+++ branches/S2_6/client/servers.c Fri Jan 29 00:41:43 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: branches/S2_6/common/connection.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/connection.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/common/connection.c (original)
+++ branches/S2_6/common/connection.c Fri Jan 29 00:41:43 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: branches/S2_6/server/civserver.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/civserver.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/server/civserver.c (original)
+++ branches/S2_6/server/civserver.c Fri Jan 29 00:41:43 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: branches/S2_6/server/meta.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/meta.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/server/meta.c (original)
+++ branches/S2_6/server/meta.c Fri Jan 29 00:41:43 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: branches/S2_6/server/sernet.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/sernet.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/server/sernet.c (original)
+++ branches/S2_6/server/sernet.c Fri Jan 29 00:41:43 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: branches/S2_6/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c (original)
+++ branches/S2_6/server/srv_main.c Fri Jan 29 00:41:43 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: branches/S2_6/tools/download.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/download.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/tools/download.c (original)
+++ branches/S2_6/tools/download.c Fri Jan 29 00:41:43 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: branches/S2_6/tools/modinst.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/tools/modinst.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/tools/modinst.c (original)
+++ branches/S2_6/tools/modinst.c Fri Jan 29 00:41:43 2016
@@ -14,6 +14,8 @@
#ifdef HAVE_CONFIG_H
#include <fc_config.h>
#endif
+
+#include "fc_prehdrs.h"
/* utility */
#include "fciconv.h"
Modified: branches/S2_6/utility/bitvector.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/bitvector.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/utility/bitvector.c (original)
+++ branches/S2_6/utility/bitvector.c Fri Jan 29 00:41:43 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: branches/S2_6/utility/capability.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/capability.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/utility/capability.c (original)
+++ branches/S2_6/utility/capability.c Fri Jan 29 00:41:43 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: branches/S2_6/utility/fcbacktrace.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/fcbacktrace.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/utility/fcbacktrace.c (original)
+++ branches/S2_6/utility/fcbacktrace.c Fri Jan 29 00:41:43 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: branches/S2_6/utility/fcthread.h
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/fcthread.h?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/utility/fcthread.h (original)
+++ branches/S2_6/utility/fcthread.h Fri Jan 29 00:41:43 2016
@@ -23,17 +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_C11_THREADS
Modified: branches/S2_6/utility/netintf.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/netintf.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/utility/netintf.c (original)
+++ branches/S2_6/utility/netintf.c Fri Jan 29 00:41:43 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: branches/S2_6/utility/shared.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/shared.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/utility/shared.c (original)
+++ branches/S2_6/utility/shared.c Fri Jan 29 00:41:43 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: branches/S2_6/utility/support.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/support.c?rev=31660&r1=31659&r2=31660&view=diff
==============================================================================
--- branches/S2_6/utility/support.c (original)
+++ branches/S2_6/utility/support.c Fri Jan 29 00:41:43 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
