From: Bruno Haible <bruno@clisp.org>
Date: Tue, 27 Jun 2006 13:15:26 +0000 (+0000)
Subject: Resolve clash between stdint.m4 and uintmax_t.m4.
X-Git-Tag: cvs-readonly~2314
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=3054e0c0b6c3f998ea52d8d25fc2bf1700a093ca;p=gnulib.git

Resolve clash between stdint.m4 and uintmax_t.m4.
---

diff --git a/lib/ChangeLog b/lib/ChangeLog
index 98708380c..6aac72ea7 100644
--- 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 3afdfaecd..9e0faab83 100644
--- 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