Resolve clash between stdint.m4 and uintmax_t.m4.

[pspp] / lib / stdint_.h

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