From 2e8e1818ae1146febd313585a8d767c3892dae03 Mon Sep 17 00:00:00 2001 From: Jim Meyering Date: Thu, 2 Oct 2008 08:44:01 +0200 Subject: [PATCH] fts: bug fixes * lib/fts.c: Remove unnecessary "defined" in cpp directive. Include , not . * m4/fts.m4 (gl_FUNC_FTS_CORE): Fix typo s/vfs/vfs.h/. Include , not . --- ChangeLog | 8 ++++++++ lib/fts.c | 4 ++-- m4/fts.m4 | 6 +++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 022f932eb..c69b59483 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-10-02 Jim Meyering + + fts: bug fixes + * lib/fts.c: Remove unnecessary "defined" in cpp directive. + Include , not . + * m4/fts.m4 (gl_FUNC_FTS_CORE): Fix typo s/vfs/vfs.h/. + Include , not . + 2008-10-01 Bruno Haible Avoid the broken posix_spawn function on AIX 5.3 and 6.1. diff --git a/lib/fts.c b/lib/fts.c index 95d0c7aa2..a55a98dd0 100644 --- a/lib/fts.c +++ b/lib/fts.c @@ -934,8 +934,8 @@ fts_children (register FTS *sp, int instr) return (sp->fts_child); } -#if defined HAVE_SYS_VFS_H && HAVE_FSTATFS && HAVE_STRUCT_STATFS_F_TYPE -# include +#if HAVE_SYS_VFS_H && HAVE_FSTATFS && HAVE_STRUCT_STATFS_F_TYPE +# include /* FIXME: what about when f_type is not an integral type? deal with that if/when it's encountered. */ static bool diff --git a/m4/fts.m4 b/m4/fts.m4 index bdba388b8..cecc93ef3 100644 --- a/m4/fts.m4 +++ b/m4/fts.m4 @@ -1,4 +1,4 @@ -#serial 15 +#serial 16 dnl Copyright (C) 2005-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -24,8 +24,8 @@ AC_DEFUN([gl_FUNC_FTS_CORE], gl_FUNC_OPENAT AC_CHECK_FUNCS_ONCE([fstatfs]) - AC_CHECK_HEADERS_ONCE([sys/param.h sys/vfs])dnl + AC_CHECK_HEADERS_ONCE([sys/param.h sys/vfs.h])dnl AC_CHECK_MEMBERS([struct statfs.f_type],,, [$ac_includes_default - #include ]) + #include ]) ]) -- 2.11.0