diff -u -p -r1.1 stdint_.h
--- lib/stdint_.h	8 Sep 2004 12:43:11 -0000	1.1
+++ lib/stdint_.h	20 Sep 2004 19:17:22 -0000
@@ -126,13 +126,7 @@ typedef unsigned long uintptr_t;
 
 /* 7.18.1.5. Greatest-width integer types */
 
-#if @HAVE_LONG_64BIT@ || @HAVE_LONGLONG_64BIT@
-typedef int64_t  intmax_t;
-typedef uint64_t uintmax_t;
-#else
-typedef int32_t  intmax_t;
-typedef uint32_t uintmax_t;
-#endif
+/* intmax_t and uintmax_t are defined in config.h by uintmax_t.m4 */
 
 /* 7.18.2. Limits of specified-width integer types */
 
@@ -220,7 +214,7 @@ typedef uint32_t uintmax_t;
 #define SIG_ATOMIC_MIN 0
 #define SIG_ATOMIC_MAX 127
 
-#define SIZE_MAX (~(size_t)0)
+/* SIZE_MAX is defined by xsize module in gnulib */
 
 /* wchar_t limits already defined in <stddef.h>.  */
 /* wint_t limits already defined in <wchar.h>.  */
diff -u -p -r1.1 stdint.m4
--- m4/stdint.m4	8 Sep 2004 12:43:11 -0000	1.1
+++ m4/stdint.m4	20 Sep 2004 19:17:22 -0000
@@ -12,12 +12,22 @@ dnl Test whether <stdint.h> is supported
 AC_DEFUN([gl_STDINT_H],
 [dnl Check for <inttypes.h>.
 AC_REQUIRE([gt_HEADER_INTTYPES_H])
+AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
+AC_REQUIRE([gl_SIZE_MAX])
 dnl Check for <sys/inttypes.h>.
 AC_CHECK_HEADERS([sys/inttypes.h])
 
-AC_MSG_CHECKING([for stdint.h])
+AC_MSG_CHECKING([for a complete stdint.h])
 AC_CACHE_VAL(gl_cv_header_stdint_h, [
-  AC_TRY_COMPILE([#include <stdint.h>], [],
+  AC_TRY_COMPILE([
+#include <stdint.h>
+int8_t a = INT8_MIN;
+int16_t b = INT16_MIN;
+int32_t c = INT32_MIN;
+uint8_t d = UINT8_MAX;
+uint16_t e = UINT16_MAX;
+uint32_t f = UINT32_MAX;
+], [],
     gl_cv_header_stdint_h=yes, gl_cv_header_stdint_h=no)])
 AC_MSG_RESULT([$gl_cv_header_stdint_h])
 if test $gl_cv_header_stdint_h = yes; then
diff -u -p -r1.1 stdint
--- modules/stdint	8 Sep 2004 12:43:11 -0000	1.1
+++ modules/stdint	20 Sep 2004 19:17:22 -0000
@@ -7,8 +7,10 @@ Files:
 lib/stdint_.h
 m4/stdint.m4
 m4/inttypes.m4
+m4/uintmax_t.m4
 
 Depends-on:
+xsize
 
 configure.ac:
 gl_STDINT_H