Author: cazfi
Date: Wed Mar 30 14:11:53 2016
New Revision: 32275

URL: http://svn.gna.org/viewcvs/freeciv?rev=32275&view=rev
Log:
Made FREECIV_MSWINDOWS public in freeciv_config.h

See patch #7036

Modified:
    trunk/configure.ac
    trunk/gen_headers/freeciv_config.h.in
    trunk/utility/support.h

Modified: trunk/configure.ac
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/configure.ac?rev=32275&r1=32274&r2=32275&view=diff
==============================================================================
--- trunk/configure.ac  (original)
+++ trunk/configure.ac  Wed Mar 30 14:11:53 2016
@@ -730,6 +730,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: trunk/gen_headers/freeciv_config.h.in
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/gen_headers/freeciv_config.h.in?rev=32275&r1=32274&r2=32275&view=diff
==============================================================================
--- trunk/gen_headers/freeciv_config.h.in       (original)
+++ trunk/gen_headers/freeciv_config.h.in       Wed Mar 30 14:11:53 2016
@@ -98,6 +98,9 @@
 /* Delta protocol enabled */
 #undef FREECIV_DELTA_PROTOCOL
 
+/* Windows build */
+#undef FREECIV_MSWINDOWS
+
 /* uses some winsock version */
 #undef FREECIV_HAVE_WINSOCK
 

Modified: trunk/utility/support.h
URL: 
http://svn.gna.org/viewcvs/freeciv/trunk/utility/support.h?rev=32275&r1=32274&r2=32275&view=diff
==============================================================================
--- trunk/utility/support.h     (original)
+++ trunk/utility/support.h     Wed Mar 30 14:11:53 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

Reply via email to