Author: cazfi Date: Thu Feb 4 22:32:36 2016 New Revision: 31753 URL: http://svn.gna.org/viewcvs/freeciv?rev=31753&view=rev Log: Made FREECIV_C11_STATIC_ASSERT and FREECIV_CXX11_STATIC_ASSERT public in freeciv_config.h
See patch #6894 Modified: trunk/gen_headers/freeciv_config.h.in trunk/m4/c++11.m4 trunk/m4/c11.m4 trunk/utility/log.h Modified: trunk/gen_headers/freeciv_config.h.in URL: http://svn.gna.org/viewcvs/freeciv/trunk/gen_headers/freeciv_config.h.in?rev=31753&r1=31752&r2=31753&view=diff ============================================================================== --- trunk/gen_headers/freeciv_config.h.in (original) +++ trunk/gen_headers/freeciv_config.h.in Thu Feb 4 22:32:36 2016 @@ -116,4 +116,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: trunk/m4/c++11.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/c%2B%2B11.m4?rev=31753&r1=31752&r2=31753&view=diff ============================================================================== --- trunk/m4/c++11.m4 (original) +++ trunk/m4/c++11.m4 Thu Feb 4 22:32:36 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: trunk/m4/c11.m4 URL: http://svn.gna.org/viewcvs/freeciv/trunk/m4/c11.m4?rev=31753&r1=31752&r2=31753&view=diff ============================================================================== --- trunk/m4/c11.m4 (original) +++ trunk/m4/c11.m4 Thu Feb 4 22:32:36 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: trunk/utility/log.h URL: http://svn.gna.org/viewcvs/freeciv/trunk/utility/log.h?rev=31753&r1=31752&r2=31753&view=diff ============================================================================== --- trunk/utility/log.h (original) +++ trunk/utility/log.h Thu Feb 4 22:32:36 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