Author: cazfi
Date: Thu Feb  4 22:32:42 2016
New Revision: 31754

URL: http://svn.gna.org/viewcvs/freeciv?rev=31754&view=rev
Log:
Made FREECIV_C11_STATIC_ASSERT and FREECIV_CXX11_STATIC_ASSERT public in 
freeciv_config.h

See patch #6894

Modified:
    branches/S2_6/gen_headers/freeciv_config.h.in
    branches/S2_6/m4/c++11.m4
    branches/S2_6/m4/c11.m4
    branches/S2_6/utility/log.h

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=31754&r1=31753&r2=31754&view=diff
==============================================================================
--- branches/S2_6/gen_headers/freeciv_config.h.in       (original)
+++ branches/S2_6/gen_headers/freeciv_config.h.in       Thu Feb  4 22:32:42 2016
@@ -110,4 +110,10 @@
 /* Max number of AI modules */
 #undef FREECIV_AI_MOD_LAST
 
+/* C11 static assert supported */
+#undef FREECIV_C11_STATIC_ASSERT
+
+/* C++11 static assert supported */
+#undef FREECIV_CXX11_STATIC_ASSERT
+
 #endif /* FC__FREECIV_CONFIG_H */

Modified: branches/S2_6/m4/c++11.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/c%2B%2B11.m4?rev=31754&r1=31753&r2=31754&view=diff
==============================================================================
--- branches/S2_6/m4/c++11.m4   (original)
+++ branches/S2_6/m4/c++11.m4   Thu Feb  4 22:32:42 2016
@@ -12,7 +12,7 @@
 [ac_cv_cxx11_static_assert=yes], [ac_cv_cxx11_static_assert=no])
        AC_LANG_POP([C++])])
     if test "x${ac_cv_cxx11_static_assert}" = "xyes" ; then
-      AC_DEFINE([CXX11_STATIC_ASSERT], [1], [C++11 static assert supported])
+      AC_DEFINE([FREECIV_CXX11_STATIC_ASSERT], [1], [C++11 static assert 
supported])
     fi
   fi
 ])

Modified: branches/S2_6/m4/c11.m4
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/m4/c11.m4?rev=31754&r1=31753&r2=31754&view=diff
==============================================================================
--- branches/S2_6/m4/c11.m4     (original)
+++ branches/S2_6/m4/c11.m4     Thu Feb  4 22:32:42 2016
@@ -9,7 +9,7 @@
 ]], [[ _Static_assert(1, "1 is not true"); ]])],
 [ac_cv_c11_static_assert=yes], [ac_cv_c11_static_assert=no])])
   if test "x${ac_cv_c11_static_assert}" = "xyes" ; then
-    AC_DEFINE([C11_STATIC_ASSERT], [1], [C11 static assert supported])
+    AC_DEFINE([FREECIV_C11_STATIC_ASSERT], [1], [C11 static assert supported])
   fi
 ])
 

Modified: branches/S2_6/utility/log.h
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/utility/log.h?rev=31754&r1=31753&r2=31754&view=diff
==============================================================================
--- branches/S2_6/utility/log.h (original)
+++ branches/S2_6/utility/log.h Thu Feb  4 22:32:42 2016
@@ -198,13 +198,13 @@
                    log_fatal(message, ## __VA_ARGS__); exit(EXIT_FAILURE))
 
 #ifdef __cplusplus
-#ifdef CXX11_STATIC_ASSERT
+#ifdef FREECIV_CXX11_STATIC_ASSERT
 #define FC_STATIC_ASSERT(cond, tag) static_assert(cond, #tag)
-#endif /* CXX11_STATIC_ASSERT */
+#endif /* FREECIV_CXX11_STATIC_ASSERT */
 #else  /* __cplusplus */
-#ifdef C11_STATIC_ASSERT
+#ifdef FREECIV_C11_STATIC_ASSERT
 #define FC_STATIC_ASSERT(cond, tag) _Static_assert(cond, #tag)
-#endif /* C11_STATIC_ASSERT */
+#endif /* FREECIV_C11_STATIC_ASSERT */
 #endif /* __cplusplus */
 
 #ifndef FC_STATIC_ASSERT


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

Reply via email to