stdint: don't assume C++11 when compiling with g++

Problem reported for glibc 2.14 and g++ by Alexander V. Lukyanov in
<http://lists.gnu.org/archive/html/bug-gnulib/2011-12/msg00099.html>.
* m4/stdint.m4 (gl_STDINT_H): Don't go to extra work to make it
work also in C++ before C++11, as that improperly inhibits
generating a substitute stdint.h for that case.

diff --git a/ChangeLog b/ChangeLog
index 58146e4..361362b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-12-15  Paul Eggert  <eggert@cs.ucla.edu>
 
+       stdint: don't assume C++11 when compiling with g++
+       Problem reported for glibc 2.14 and g++ by Alexander V. Lukyanov in
+       <http://lists.gnu.org/archive/html/bug-gnulib/2011-12/msg00099.html>.
+       * m4/stdint.m4 (gl_STDINT_H): Don't go to extra work to make it
+       work also in C++ before C++11, as that improperly inhibits
+       generating a substitute stdint.h for that case.
+
+2011-12-15  Paul Eggert  <eggert@cs.ucla.edu>
+
        alloca: protect comment from gnulib-tool
        * lib/alloca.c: Change "GCC version 2" to "GCC 2" in comment, so
        that gnulib-tool doesn't think it's a license, and munge it to

diff --git a/m4/stdint.m4 b/m4/stdint.m4
index cfad016..cc3866b 100644 (file)
--- a/m4/stdint.m4
+++ b/m4/stdint.m4
@@ -1,4 +1,4 @@
-# stdint.m4 serial 42
+# stdint.m4 serial 43
 dnl Copyright (C) 2001-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -69,8 +69,6 @@ AC_DEFUN_ONCE([gl_STDINT_H],
       [gl_cv_header_working_stdint_h=no
        AC_COMPILE_IFELSE([
          AC_LANG_PROGRAM([[
-#define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ before C++11 */
-#define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ before C++11 */
 #define _GL_JUST_INCLUDE_SYSTEM_STDINT_H 1 /* work if build isn't clean */
 #include <stdint.h>
 /* Dragonfly defines WCHAR_MIN, WCHAR_MAX only in <wchar.h>.  */