Resolve clash between stdint.m4 and uintmax_t.m4.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 98708380c633c33ba077299a8b823ced27bf5584..6aac72ea71509fd39b652cdc6cc0c8e11ac42a7c 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,7 @@
+2006-06-27  Bruno Haible  <bruno@clisp.org>
+
+       * stdlib_.h (intmax_t, uintmax_t): Undefine before typedef.
+
 2006-06-26  Paul Eggert  <eggert@cs.ucla.edu>
 
        * base64.c (B64): Use _ as the formal parameter, not x, to avoid

diff --git a/lib/stdint_.h b/lib/stdint_.h
index 3afdfaecd8ca50e2d108bf95a6fe32d6eecaac98..9e0faab83331280c2cd723b2ec4b708724d93c4b 100644 (file)
--- a/lib/stdint_.h
+++ b/lib/stdint_.h
@@ -261,6 +261,8 @@ typedef unsigned long uintptr_t;
    public header files. */
 
 #if !@HAVE_INTMAX_T@
+/* Remove possible redundant definition from gnulib's config.h first.  */
+# undef intmax_t
 # ifdef _STDINT_H_HAVE_INT64
 typedef int64_t  intmax_t;
 # else
@@ -268,6 +270,8 @@ typedef int32_t  intmax_t;
 # endif
 #endif
 #if !@HAVE_UINTMAX_T@
+/* Remove possible redundant definition from gnulib's config.h first.  */
+# undef uintmax_t
 # ifdef _STDINT_H_HAVE_UINT64
 typedef uint64_t uintmax_t;
 # else