>From e712b48a4791771a4d22acc68ec39fdbd985d738 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 26 Jul 2020 16:04:03 +0200 Subject: [PATCH 2/4] stdint: Change configure message. * m4/stdint.m4 (gl_STDINT_H): Say "checking whether stdint.h works without ISO C predefines..." instead of "checking whether stdint.h predates C++11...". --- ChangeLog | 7 +++++++ m4/stdint.m4 | 18 ++++++++++-------- 2 files changed, 17 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index af2e20a..f9036ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2020-07-26 Bruno Haible + stdint: Change configure message. + * m4/stdint.m4 (gl_STDINT_H): Say "checking whether stdint.h works + without ISO C predefines..." instead of "checking whether stdint.h + predates C++11...". + +2020-07-26 Bruno Haible + socketlib: Change configure message. * m4/socketlib.m4 (gl_SOCKETLIB): Say "checking for WSAStartup..." instead of "checking if we need to call WSAStartup in winsock2.h and diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 29ad826..0aed997 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,4 +1,4 @@ -# stdint.m4 serial 54 +# stdint.m4 serial 55 dnl Copyright (C) 2001-2020 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -302,9 +302,10 @@ static const char *macro_values[] = HAVE_C99_STDINT_H=1 dnl Now see whether the system works without dnl __STDC_CONSTANT_MACROS/__STDC_LIMIT_MACROS defined. - AC_CACHE_CHECK([whether stdint.h predates C++11], - [gl_cv_header_stdint_predates_cxx11_h], - [gl_cv_header_stdint_predates_cxx11_h=yes + dnl If not, there would be problems when stdint.h is included from C++. + AC_CACHE_CHECK([whether stdint.h works without ISO C predefines], + [gl_cv_header_stdint_without_STDC_macros], + [gl_cv_header_stdint_without_STDC_macros=no AC_COMPILE_IFELSE([ AC_LANG_PROGRAM([[ #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */ @@ -315,13 +316,14 @@ gl_STDINT_INCLUDES intmax_t im = INTMAX_MAX; int32_t i32 = INT32_C (0x7fffffff); ]])], - [gl_cv_header_stdint_predates_cxx11_h=no])]) + [gl_cv_header_stdint_without_STDC_macros=yes]) + ]) - if test "$gl_cv_header_stdint_predates_cxx11_h" = yes; then + if test $gl_cv_header_stdint_without_STDC_macros = no; then AC_DEFINE([__STDC_CONSTANT_MACROS], [1], - [Define to 1 if the system predates C++11.]) + [Define to 1 if the system predates C++11.]) AC_DEFINE([__STDC_LIMIT_MACROS], [1], - [Define to 1 if the system predates C++11.]) + [Define to 1 if the system predates C++11.]) fi AC_CACHE_CHECK([whether stdint.h has UINTMAX_WIDTH etc.], [gl_cv_header_stdint_width], -- 2.7.4