# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1323978505 28800
# Node ID 5b10a18ee23a8938308ad8a7cd0390a6a14ee267
# Parent  be4eea839ea671e2f39de16b0f661c2e237033a0
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
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+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
diff --git a/m4/stdint.m4 b/m4/stdint.m4
--- 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 @@
       [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>.  */