Author: cazfi
Date: Wed Apr 20 19:17:35 2016
New Revision: 32447

URL: http://svn.gna.org/viewcvs/freeciv?rev=32447&view=rev
Log:
Include "fc_prehdrsh.h" to source files where it's needed.

See patch #7116

Modified:
    trunk/common/dataio_json.c
    trunk/common/dataio_raw.c
    trunk/common/packets.c
    trunk/common/packets_json.c
    trunk/utility/ioz.c

Modified: trunk/common/dataio_json.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/dataio_json.c?rev=32447&r1=32446&r2=32447&view=diff
==============================================================================
--- trunk/common/dataio_json.c  (original)
+++ trunk/common/dataio_json.c  Wed Apr 20 19:17:35 2016
@@ -16,6 +16,8 @@
 #endif
 
 #ifdef FREECIV_JSON_CONNECTION
+
+#include "fc_prehdrs.h"
 
 #include <curl/curl.h>
 
@@ -38,13 +40,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 "bitvector.h"

Modified: trunk/common/dataio_raw.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/dataio_raw.c?rev=32447&r1=32446&r2=32447&view=diff
==============================================================================
--- trunk/common/dataio_raw.c   (original)
+++ trunk/common/dataio_raw.c   Wed Apr 20 19:17:35 2016
@@ -22,6 +22,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <limits.h>
 #include <math.h>
@@ -42,13 +44,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 "bitvector.h"

Modified: trunk/common/packets.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets.c?rev=32447&r1=32446&r2=32447&view=diff
==============================================================================
--- trunk/common/packets.c      (original)
+++ trunk/common/packets.c      Wed Apr 20 19:17:35 2016
@@ -15,6 +15,8 @@
 #include <fc_config.h>
 #endif
 
+#include "fc_prehdrs.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -26,13 +28,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.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: trunk/common/packets_json.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/common/packets_json.c?rev=32447&r1=32446&r2=32447&view=diff
==============================================================================
--- trunk/common/packets_json.c (original)
+++ trunk/common/packets_json.c Wed Apr 20 19:17:35 2016
@@ -17,6 +17,8 @@
 
 #ifdef FREECIV_JSON_CONNECTION
 
+#include "fc_prehdrs.h"
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -28,13 +30,6 @@
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.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 <jansson.h>
 

Modified: trunk/utility/ioz.c
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/ioz.c?rev=32447&r1=32446&r2=32447&view=diff
==============================================================================
--- trunk/utility/ioz.c (original)
+++ trunk/utility/ioz.c Wed Apr 20 19:17:35 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.
 ***********************************************************************/
 
-/**********************************************************************
+/***********************************************************************
   An IO layer to support transparent compression/uncompression.
   (Currently only "required" functionality is supported.)
 
@@ -27,24 +27,18 @@
 
   FIXME: when zlib support _not_ included, should sanity check whether
   the first few bytes are gzip marker and complain if so.
-**********************************************************************/
+***********************************************************************/
 
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <errno.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.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 FREECIV_HAVE_LIBZ
 #include <zlib.h>


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

Reply via email to