From b24a905279424a69e3f935efa97891d87ba17dc5 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 27 May 2005 23:59:20 +0000 Subject: [PATCH] * modules/fts (Files): Remove m4/inttypes-pri.m4. * modules/fts-lgpl (Depends-on): Remove gettext. * lib/fts.c: Don't worry about debugging on pre-C99-comopatible hosts; the configuration hassle isn't worth it. Include inttypes.h and stdint.h unconditionally if FTS_DEBUG. (LONGEST_MODIFIER, PRIuMAX): Remove. * m4/fts.m4 (gl_FUNC_FTS_CORE): Don't check for inttypes.h or stdint.h, and don't require gt_INTTYPES_PRI. --- ChangeLog | 5 +++++ lib/ChangeLog | 7 +++++++ lib/fts.c | 21 +++------------------ m4/ChangeLog | 5 +++++ m4/fts.m4 | 6 +----- modules/fts | 1 - modules/fts-lgpl | 1 - 7 files changed, 21 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index b668e7d8d2..d889923f7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2005-05-27 Paul Eggert + + * modules/fts (Files): Remove m4/inttypes-pri.m4. + * modules/fts-lgpl (Depends-on): Remove gettext. + 2005-05-25 Derek Price * MODULES.html.sh: Add getlogin_r to POSIX.2001 support section. diff --git a/lib/ChangeLog b/lib/ChangeLog index 095cd39527..3c99eb4e4a 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2005-05-27 Paul Eggert + + * fts.c: Don't worry about debugging on pre-C99-comopatible hosts; + the configuration hassle isn't worth it. + Include inttypes.h and stdint.h unconditionally if FTS_DEBUG. + (LONGEST_MODIFIER, PRIuMAX): Remove. + 2005-05-27 Bruno Haible * getlogin_r.h: Remove second include of . diff --git a/lib/fts.c b/lib/fts.c index 418e75b278..a9abe0f10c 100644 --- a/lib/fts.c +++ b/lib/fts.c @@ -70,23 +70,6 @@ static char sccsid[] = "@(#)fts.c 8.6 (Berkeley) 8/14/94"; #include #include #include -#if HAVE_INTTYPES_H -# include -#endif -#if HAVE_STDINT_H -# include -#endif -#if ULONG_MAX < ULLONG_MAX -# define LONGEST_MODIFIER "ll" -#else -# define LONGEST_MODIFIER "l" -#endif -#if PRI_MACROS_BROKEN -# undef PRIuMAX -#endif -#ifndef PRIuMAX -# define PRIuMAX LONGEST_MODIFIER "u" -#endif #if defined _LIBC # include @@ -201,8 +184,10 @@ static int fd_safer (int fd) { return fd; } #define BREAD 3 /* fts_read */ #if FTS_DEBUG -bool fts_debug = false; +# include +# include # include +bool fts_debug = false; # define Dprintf(x) do { if (fts_debug) printf x; } while (0) #else # define Dprintf(x) diff --git a/m4/ChangeLog b/m4/ChangeLog index 53849a99fc..c7d805e235 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2005-05-27 Paul Eggert + + * fts.m4 (gl_FUNC_FTS_CORE): Don't check for inttypes.h or stdint.h, + and don't require gt_INTTYPES_PRI. + 2005-05-26 Paul Eggert * extensions.m4 (gl_USE_SYSTEM_EXTENSIONS): Define diff --git a/m4/fts.m4 b/m4/fts.m4 index 94f5e84f7e..1c9703a766 100644 --- a/m4/fts.m4 +++ b/m4/fts.m4 @@ -1,4 +1,4 @@ -#serial 4 +#serial 5 dnl Copyright (C) 2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -30,12 +30,8 @@ AC_DEFUN([gl_FUNC_FTS_CORE], # Checks for header files. AC_REQUIRE([AC_HEADER_DIRENT]) - AC_CHECK_HEADERS_ONCE([inttypes.h stdint.h]) AC_CHECK_HEADERS_ONCE([sys/param.h]) - # Checks for typedefs, structures, and compiler characteristics. - AC_REQUIRE([gt_INTTYPES_PRI]) - # Checks for library functions. AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) ]) diff --git a/modules/fts b/modules/fts index 75f6fe2f47..434ce1feea 100644 --- a/modules/fts +++ b/modules/fts @@ -6,7 +6,6 @@ lib/fts_.h lib/fts.c lib/fts-cycle.c m4/fts.m4 -m4/inttypes-pri.m4 Depends-on: cycle-check diff --git a/modules/fts-lgpl b/modules/fts-lgpl index ed68cd38ff..215359c03c 100644 --- a/modules/fts-lgpl +++ b/modules/fts-lgpl @@ -9,7 +9,6 @@ m4/fts.m4 Depends-on: dirfd stdbool -gettext configure.ac: gl_FUNC_FTS_LGPL -- 2.30.2