Author: cazfi Date: Tue May 3 05:15:15 2016 New Revision: 32545 URL: http://svn.gna.org/viewcvs/freeciv?rev=32545&view=rev Log: Dropped direct winsock2.h includes from files that get it via fc_prehdrs.h
See patch #7134 Modified: trunk/client/client_main.c trunk/client/clinet.c trunk/client/gui-sdl2/gui_main.c trunk/common/networking/connection.c trunk/server/meta.c trunk/server/sernet.c trunk/server/srv_main.c trunk/utility/netintf.c trunk/utility/netintf.h trunk/utility/shared.c trunk/utility/support.c Modified: trunk/client/client_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/client_main.c?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/client/client_main.c (original) +++ trunk/client/client_main.c Tue May 3 05:15:15 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: trunk/client/clinet.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/clinet.c?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/client/clinet.c (original) +++ trunk/client/clinet.c Tue May 3 05:15:15 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: trunk/client/gui-sdl2/gui_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-sdl2/gui_main.c?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/client/gui-sdl2/gui_main.c (original) +++ trunk/client/gui-sdl2/gui_main.c Tue May 3 05:15:15 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: trunk/common/networking/connection.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/common/networking/connection.c?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/common/networking/connection.c (original) +++ trunk/common/networking/connection.c Tue May 3 05:15:15 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: trunk/server/meta.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/meta.c?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/server/meta.c (original) +++ trunk/server/meta.c Tue May 3 05:15:15 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: trunk/server/sernet.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/sernet.c?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/server/sernet.c (original) +++ trunk/server/sernet.c Tue May 3 05:15:15 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: trunk/server/srv_main.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/server/srv_main.c?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/server/srv_main.c (original) +++ trunk/server/srv_main.c Tue May 3 05:15:15 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: trunk/utility/netintf.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.c?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/utility/netintf.c (original) +++ trunk/utility/netintf.c Tue May 3 05:15:15 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: trunk/utility/netintf.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/netintf.h?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/utility/netintf.h (original) +++ trunk/utility/netintf.h Tue May 3 05:15:15 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: trunk/utility/shared.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/shared.c?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/utility/shared.c (original) +++ trunk/utility/shared.c Tue May 3 05:15:15 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: trunk/utility/support.c URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/support.c?rev=32545&r1=32544&r2=32545&view=diff ============================================================================== --- trunk/utility/support.c (original) +++ trunk/utility/support.c Tue May 3 05:15:15 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