Mercurial > gnulib
changeset 30255:e97324d6f4f9
fts: bug fixes
* lib/fts.c: Remove unnecessary "defined" in cpp directive.
Include <sys/vfs.h>, not <sys/statfs.h>.
* m4/fts.m4 (gl_FUNC_FTS_CORE): Fix typo s/vfs/vfs.h/.
Include <sys/vfs.h>, not <sys/statfs.h>.
| author | Jim Meyering <meyering@redhat.com> |
|---|---|
| date | Thu, 02 Oct 2008 08:44:01 +0200 |
| parents | 3e091c11fedc |
| children | 56ddb6d579cf |
| files | ChangeLog lib/fts.c m4/fts.m4 |
| diffstat | 3 files changed, 13 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Oct 02 01:26:13 2008 +0200 +++ b/ChangeLog Thu Oct 02 08:44:01 2008 +0200 @@ -1,3 +1,11 @@ +2008-10-02 Jim Meyering <meyering@redhat.com> + + fts: bug fixes + * lib/fts.c: Remove unnecessary "defined" in cpp directive. + Include <sys/vfs.h>, not <sys/statfs.h>. + * m4/fts.m4 (gl_FUNC_FTS_CORE): Fix typo s/vfs/vfs.h/. + Include <sys/vfs.h>, not <sys/statfs.h>. + 2008-10-01 Bruno Haible <bruno@clisp.org> Avoid the broken posix_spawn function on AIX 5.3 and 6.1.
--- a/lib/fts.c Thu Oct 02 01:26:13 2008 +0200 +++ b/lib/fts.c Thu Oct 02 08:44:01 2008 +0200 @@ -934,8 +934,8 @@ return (sp->fts_child); } -#if defined HAVE_SYS_VFS_H && HAVE_FSTATFS && HAVE_STRUCT_STATFS_F_TYPE -# include <sys/statfs.h> +#if HAVE_SYS_VFS_H && HAVE_FSTATFS && HAVE_STRUCT_STATFS_F_TYPE +# include <sys/vfs.h> /* FIXME: what about when f_type is not an integral type? deal with that if/when it's encountered. */ static bool
--- a/m4/fts.m4 Thu Oct 02 01:26:13 2008 +0200 +++ b/m4/fts.m4 Thu Oct 02 08:44:01 2008 +0200 @@ -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 @@ 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 <sys/statfs.h>]) + #include <sys/vfs.h>]) ])