--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-13  Bruno Haible  <bruno@clisp.org>
+
+	* lib/stdint_.h: Fix typo: _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H was
+	misspelled as _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H.
+
 2007-07-13  Jim Meyering  <jim@meyering.net>
 
 	df: Don't fail for Tru64's "file-on-file mount".
@@ -36,7 +41,7 @@
 2007-07-11  Karl Berry  <karl@gnu.org>
 
 	* MODULES.html.sh (func_module): use
-	 sed -e '\|^'"${includefile}"'$|d' 
+	 sed -e '\|^'"${includefile}"'$|d'
 	 instead of /.../d, to avoid errors on $includefile's containing /.
 
 2007-07-10  Sergey Poznyakoff  <gray@gnu.org.ua>

--- a/lib/inttypes_.h
+++ b/lib/inttypes_.h
@@ -35,17 +35,7 @@
 #define INTTYPES_H
 
 /* Include <stdint.h> or the gnulib replacement.  */
-#if ! defined __cplusplus || defined __STDC_LIMIT_MACROS
-# include <stdint.h>
-#else
-/* Macros like INT32_MIN are used below, so define __STDC_LIMIT_MACROS
-   while including <stdint.h>; this isn't namespace clean for C++,
-   unfortunately.  */
-# define __STDC_LIMIT_MACROS
-# include <stdint.h>
-# undef __STDC_LIMIT_MACROS
-#endif
-
+#include <stdint.h>
 /* Get CHAR_BIT.  */
 #include <limits.h>
 

--- a/lib/stdint_.h
+++ b/lib/stdint_.h
@@ -66,9 +66,9 @@
   /* In OpenBSD 3.8, <inttypes.h> includes <machine/types.h>, which defines
      int{8,16,32,64}_t, uint{8,16,32,64}_t and __BIT_TYPES_DEFINED__.
      <inttypes.h> also defines intptr_t and uintptr_t.  */
-# define _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
+# define _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 # include <inttypes.h>
-# undef _GL_JUST_INCLUDE_ABSOLUTE_INTTYPES_H
+# undef _GL_JUST_INCLUDE_SYSTEM_INTTYPES_H
 #elif @HAVE_SYS_INTTYPES_H@
   /* Solaris 7 <sys/inttypes.h> has the types except the *_fast*_t types, and
      the macros except for *_FAST*_*, INTPTR_MIN, PTRDIFF_MIN, PTRDIFF_MAX.  */