summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2006-08-28 20:51:56 +0000
committerPaul Eggert <eggert@cs.ucla.edu>2006-08-28 20:51:56 +0000
commita66840f18dbdd1e1852929a4b58c8bebee10d685 (patch)
treea2e016ba81683d752f9a9804f1c729e03d269148
parentba663fc19010d2d6ec95690d19ab348457ad06a1 (diff)
downloadcoreutils-a66840f18dbdd1e1852929a4b58c8bebee10d685.tar.xz
Adjust to recent gnulib changes for the inttypes module.
* bootstrap.conf (gnulib_modules): Remove stdint; add inttypes. (excluded_files): Don't exclude m4/inttypes-h.m4 or m4/inttypes-pri.m4. * src/system.h: Don't bother to include <stdint.h>, since we can now assume inttypes.h does the equivalent of including stdint.h.
-rw-r--r--ChangeLog8
-rw-r--r--bootstrap.conf6
-rw-r--r--src/system.h1
3 files changed, 10 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 0163c1927..c30cc31dd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-08-28 Paul Eggert <eggert@cs.ucla.edu>
+
+ Adjust to recent gnulib changes for the inttypes module.
+ * bootstrap.conf (gnulib_modules): Remove stdint; add inttypes.
+ (excluded_files): Don't exclude m4/inttypes-h.m4 or m4/inttypes-pri.m4.
+ * src/system.h: Don't bother to include <stdint.h>, since we can
+ now assume inttypes.h does the equivalent of including stdint.h.
+
2006-08-27 Jim Meyering <jim@meyering.net>
* src/copy.c (copy_internal): Don't make a backup if the last
diff --git a/bootstrap.conf b/bootstrap.conf
index e604213ae..173d9b1fc 100644
--- a/bootstrap.conf
+++ b/bootstrap.conf
@@ -47,14 +47,14 @@ gnulib_modules="
getline getloadavg getndelim2 getopt getpagesize getpass-gnu
gettext gettime gettimeofday getugroups getusershell gnupload
group-member hard-locale hash hash-pjw host-os human idcache
- inttostr lchmod lchown lib-ignore linebuffer link-follow
+ inttostr inttypes lchmod lchown lib-ignore linebuffer link-follow
long-options lstat malloc mbswidth md5 memcasecmp mempcpy
memrchr mkancesdirs mkdir mkdir-p mkstemp mktime modechange
mountlist obstack pathmax perl physmem posixtm posixver putenv
quote quotearg raise readlink readtokens readtokens0 readutmp
realloc regex rmdir rmdir-errno rpmatch safe-read same
save-cwd savedir settime sha1 sig2str ssize_t stat-macros
- stat-time stdbool stdint stdlib-safer stpcpy strcase strftime
+ stat-time stdbool stdlib-safer stpcpy strcase strftime
strpbrk strtoimax strtoumax strverscmp timespec tzset
unicodeio unistd-safer unlink-busy unlinkdir unlocked-io
uptime userspec utimecmp utimens vasprintf verify version-etc-fsf
@@ -79,8 +79,6 @@ XGETTEXT_OPTIONS=$XGETTEXT_OPTIONS'\\\
excluded_files='
m4/glibc2.m4
m4/intdiv0.m4
- m4/inttypes-h.m4
- m4/inttypes-pri.m4
m4/lcmessage.m4
m4/lock.m4
m4/printf-posix.m4
diff --git a/src/system.h b/src/system.h
index 226c863c9..8901bb5ad 100644
--- a/src/system.h
+++ b/src/system.h
@@ -328,7 +328,6 @@ enum
#include "timespec.h"
#include <inttypes.h>
-#include <stdint.h>
#include <ctype.h>