Author: cazfi
Date: Wed Apr 20 19:17:43 2016
New Revision: 32448

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

See patch #7116

Modified:
    branches/S2_6/common/dataio.c
    branches/S2_6/common/packets.c
    branches/S2_6/utility/ioz.c

Modified: branches/S2_6/common/dataio.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/dataio.c?rev=32448&r1=32447&r2=32448&view=diff
==============================================================================
--- branches/S2_6/common/dataio.c       (original)
+++ branches/S2_6/common/dataio.c       Wed Apr 20 19:17:43 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
@@ -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"
@@ -67,7 +62,7 @@
 #include "dataio.h"
 
 static bool get_conv(char *dst, size_t ndst, const char *src,
-                    size_t nsrc);
+                     size_t nsrc);
 
 static DIO_PUT_CONV_FUN put_conv_callback = NULL;
 static DIO_GET_CONV_FUN get_conv_callback = get_conv;

Modified: branches/S2_6/common/packets.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/packets.c?rev=32448&r1=32447&r2=32448&view=diff
==============================================================================
--- branches/S2_6/common/packets.c      (original)
+++ branches/S2_6/common/packets.c      Wed Apr 20 19:17:43 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
@@ -14,6 +14,8 @@
 #ifdef HAVE_CONFIG_H
 #include <fc_config.h>
 #endif
+
+#include "fc_prehdrs.h"
 
 #include <stdio.h>
 #include <stdlib.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: branches/S2_6/utility/ioz.c
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/ioz.c?rev=32448&r1=32447&r2=32448&view=diff
==============================================================================
--- branches/S2_6/utility/ioz.c (original)
+++ branches/S2_6/utility/ioz.c Wed Apr 20 19:17:43 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