changeset 5894:d09af5fbd9f2

* 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.
author Paul Eggert <eggert@cs.ucla.edu>
date Fri, 27 May 2005 23:59:20 +0000
parents a1680eb6e59e
children 1640ff3cd5f5
files ChangeLog lib/ChangeLog lib/fts.c m4/ChangeLog m4/fts.m4 modules/fts modules/fts-lgpl
diffstat 7 files changed, 21 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri May 27 12:43:30 2005 +0000
+++ b/ChangeLog	Fri May 27 23:59:20 2005 +0000
@@ -1,3 +1,8 @@
+2005-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* modules/fts (Files): Remove m4/inttypes-pri.m4.
+	* modules/fts-lgpl (Depends-on): Remove gettext.
+
 2005-05-25  Derek Price  <derek@ximbiot.com>
 
 	* MODULES.html.sh: Add getlogin_r to POSIX.2001 support section.
--- a/lib/ChangeLog	Fri May 27 12:43:30 2005 +0000
+++ b/lib/ChangeLog	Fri May 27 23:59:20 2005 +0000
@@ -1,3 +1,10 @@
+2005-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* 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  <bruno@clisp.org>
 
 	* getlogin_r.h: Remove second include of <stddef.h>.
--- a/lib/fts.c	Fri May 27 12:43:30 2005 +0000
+++ b/lib/fts.c	Fri May 27 23:59:20 2005 +0000
@@ -70,23 +70,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
-#if HAVE_INTTYPES_H
-# include <inttypes.h>
-#endif
-#if HAVE_STDINT_H
-# include <stdint.h>
-#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 <dirent.h>
@@ -201,8 +184,10 @@
 #define BREAD		3		/* fts_read */
 
 #if FTS_DEBUG
+# include <inttypes.h>
+# include <stdint.h>
+# include <stdio.h>
 bool fts_debug = false;
-# include <stdio.h>
 # define Dprintf(x) do { if (fts_debug) printf x; } while (0)
 #else
 # define Dprintf(x)
--- a/m4/ChangeLog	Fri May 27 12:43:30 2005 +0000
+++ b/m4/ChangeLog	Fri May 27 23:59:20 2005 +0000
@@ -1,3 +1,8 @@
+2005-05-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* 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  <eggert@cs.ucla.edu>
 
 	* extensions.m4 (gl_USE_SYSTEM_EXTENSIONS): Define
--- a/m4/fts.m4	Fri May 27 12:43:30 2005 +0000
+++ b/m4/fts.m4	Fri May 27 23:59:20 2005 +0000
@@ -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 @@
 
   # 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])
 ])
--- a/modules/fts	Fri May 27 12:43:30 2005 +0000
+++ b/modules/fts	Fri May 27 23:59:20 2005 +0000
@@ -6,7 +6,6 @@
 lib/fts.c
 lib/fts-cycle.c
 m4/fts.m4
-m4/inttypes-pri.m4
 
 Depends-on:
 cycle-check
--- a/modules/fts-lgpl	Fri May 27 12:43:30 2005 +0000
+++ b/modules/fts-lgpl	Fri May 27 23:59:20 2005 +0000
@@ -9,7 +9,6 @@
 Depends-on:
 dirfd
 stdbool
-gettext
 
 configure.ac:
 gl_FUNC_FTS_LGPL