Include <stdint.h> even if HAVE_INTTYPES_H is defined.

diff --git a/ChangeLog b/ChangeLog
index 4b025c069055053af0a2534407289c6a2a459e8c..1cda3fa944a4ee229e766f78bafe42694f1d4b55 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2004-01-26  Paul Eggert  <eggert@twinsun.com>
+
+       * doc/autoconf.texi (Default Includes): Include <stdint.h> even if
+       HAVE_INTTYPES_H is defined.  This is needed on Tru64 5.1b with
+       Compac C V6.5-207 (dtk), which defines uintmax_t in <stdint.h> but
+       not <inttypes.h>.  Problem reported by Tim Mooney in
+       <http://mail.gnu.org/archive/html/bug-coreutils/2004-01/msg00147.html>.
+       * lib/autoconf/headers.m4 (_AC_INCLUDES_DEFAULT_REQUIREMENTS):
+       Likewise.
+       
+       * lib/autoconf/programs.m4 (AC_PROG_SED): Use diff, not sed;
+       otherwise "make check" fails because it forbids cmp (I guess
+       because cmp treats files as binary on DOS-like systems).
+
+       * tests/mktests.sh: Update copyright date to 2004, since some tests
+       have changed in 2004.
+
 2004-01-23  Gary V. Vaugan  <gary@gnu.org>
 
        * lib/autoconf/programs.m4 (AC_PROG_SED):  New macro to test for a

diff --git a/doc/autoconf.texi b/doc/autoconf.texi
index b567a576be4a71aa18a419e3b0be27770cc7e9ec..6d9b68b7fdcd55d0b7704c7c28d925d1c5f8f654 100644 (file)
--- a/doc/autoconf.texi
+++ b/doc/autoconf.texi
@@ -3184,10 +3184,9 @@ Expand to @var{include-directives} if defined, otherwise to:
 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
+#endif
+#if HAVE_STDINT_H
+# include <stdint.h>
 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>

diff --git a/lib/autoconf/headers.m4 b/lib/autoconf/headers.m4
index 10504f98cf63bd2b71fb28085f8e4e4684790113..393be3487c563c7295b10bdeb610cbc1c01b6089 100644 (file)
--- a/lib/autoconf/headers.m4
+++ b/lib/autoconf/headers.m4
@@ -1,7 +1,7 @@
 # This file is part of Autoconf.                       -*- Autoconf -*-
 # Checking for headers.
 #
-# Copyright (C) 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright (C) 2000, 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -250,10 +250,9 @@ ac_includes_default="\
 #endif
 #if HAVE_INTTYPES_H
 # include <inttypes.h>
-#else
-# if HAVE_STDINT_H
-#  include <stdint.h>
-# endif
+#endif
+#if HAVE_STDINT_H
+# include <stdint.h>
 #endif
 #if HAVE_UNISTD_H
 # include <unistd.h>