Author: cazfi Date: Mon Mar 30 19:40:00 2015 New Revision: 28664 URL: http://svn.gna.org/viewcvs/freeciv?rev=28664&view=rev Log: Fixed nullptr configure check to include cstddef header if available, in case nullptr definition is found there.
Patch by Alexey Novikov <alekswn> See bug #23414 Modified: branches/S2_5/m4/c++11.m4 Modified: branches/S2_5/m4/c++11.m4 URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/m4/c%2B%2B11.m4?rev=28664&r1=28663&r2=28664&view=diff ============================================================================== --- branches/S2_5/m4/c++11.m4 (original) +++ branches/S2_5/m4/c++11.m4 Mon Mar 30 19:40:00 2015 @@ -5,14 +5,18 @@ AC_DEFUN([FC_CXX11_NULLPTR], [ if test "x$cxx_works" = "xyes" ; then + AC_LANG_PUSH([C++]) + AC_CHECK_HEADERS([cstddef]) AC_CACHE_CHECK([for C++11 nullptr], [ac_cv_cxx11_nullptr], - [AC_LANG_PUSH([C++]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([[ -]], [[ int *var = nullptr; ]])], -[ac_cv_cxx11_nullptr=yes], [ac_cv_cxx11_nullptr=no]) - AC_LANG_POP([C++])]) + [AC_LINK_IFELSE([AC_LANG_PROGRAM( +[[#ifdef HAVE_CSTDDEF +#include <cstddef> +#endif]], + [[ int *var = nullptr; ]])], +[ac_cv_cxx11_nullptr=yes], [ac_cv_cxx11_nullptr=no])]) if test "x${ac_cv_cxx11_nullptr}" != "xyes" ; then AC_DEFINE([nullptr], [0], [Fallback since C++11 nullptr not available]) fi + AC_LANG_POP([C++]) fi ]) _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits