Author: cazfi Date: Wed Mar 30 14:11:59 2016 New Revision: 32276 URL: http://svn.gna.org/viewcvs/freeciv?rev=32276&view=rev Log: Made FREECIV_MSWINDOWS public in freeciv_config.h
See patch #7036 Modified: branches/S2_6/configure.ac branches/S2_6/gen_headers/freeciv_config.h.in branches/S2_6/utility/support.h Modified: branches/S2_6/configure.ac URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/configure.ac?rev=32276&r1=32275&r2=32276&view=diff ============================================================================== --- branches/S2_6/configure.ac (original) +++ branches/S2_6/configure.ac Wed Mar 30 14:11:59 2016 @@ -691,6 +691,10 @@ AC_DEFINE([FREECIV_SOCKET_ZERO_NOT_STDIN], [1], [Mingw-specific setting - stdin]) AC_DEFINE([ALWAYS_ROOT], [1], [Can execute program as root - Mingw]) + AC_DEFINE([FREECIV_MSWINDOWS], [1], [Windows build]) + + dnl Backward compatibility macro, FREECIV_MSWINDOWS is the preferred one, and + dnl one that must be used in public headers. AC_DEFINE([WIN32_NATIVE], [1], [Mingw-specific setting - native]) AC_DEFINE([NONBLOCKING_SOCKETS], [1], [nonblocking sockets support]) ;; Modified: branches/S2_6/gen_headers/freeciv_config.h.in URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/gen_headers/freeciv_config.h.in?rev=32276&r1=32275&r2=32276&view=diff ============================================================================== --- branches/S2_6/gen_headers/freeciv_config.h.in (original) +++ branches/S2_6/gen_headers/freeciv_config.h.in Wed Mar 30 14:11:59 2016 @@ -92,6 +92,9 @@ /* jansson network protocol in use */ #undef FREECIV_JSON_CONNECTION +/* Windows build */ +#undef FREECIV_MSWINDOWS + /* uses some winsock version */ #undef FREECIV_HAVE_WINSOCK Modified: branches/S2_6/utility/support.h URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/support.h?rev=32276&r1=32275&r2=32276&view=diff ============================================================================== --- branches/S2_6/utility/support.h (original) +++ branches/S2_6/utility/support.h Wed Mar 30 14:11:59 2016 @@ -100,7 +100,7 @@ #define fc__warn_unused_result #endif -#ifdef WIN32_NATIVE +#ifdef FREECIV_MSWINDOWS typedef long int fc_errno; #else typedef int fc_errno; _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits