the patch from 2006-08-18 broke on cygwin.

diff --git a/ChangeLog b/ChangeLog
index 31f0d6aef8dfd756d4b6b57e98451374311b20e7..baa556f7a910556bb3869e14a69cb11cca367675 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-20  Eric Blake  <ebb9@byu.net>
+
+       * src/stat.c (USE_STATVFS): Reinstate the patch from 2006-08-15;
+       the patch from 2006-08-18 broke on cygwin.
+
 2006-08-20  Jim Meyering  <jim@meyering.net>
 
        * NEWS: Add a line for 6.2-cvs.

diff --git a/src/stat.c b/src/stat.c
index 4ea66fde7faf814db7173238d9efe0b9a170cba5..777266ea3aaf5bd23e3a0edf29bd6dbee9975c55 100644 (file)
--- a/src/stat.c
+++ b/src/stat.c
@@ -21,7 +21,7 @@
 
 #if (STAT_STATVFS \
      && (HAVE_STRUCT_STATVFS_F_BASETYPE || HAVE_STRUCT_STATVFS_F_FSTYPENAME \
-        || ! HAVE_STRUCT_STATFS_F_FSTYPENAME))
+        || (! HAVE_STRUCT_STATFS_F_FSTYPENAME && HAVE_STRUCT_STATVFS_F_TYPE)))
 # define USE_STATVFS 1
 #else
 # define USE_STATVFS 0
@@ -139,7 +139,8 @@ static char const *trailing_delim = "";
    Some systems have statfvs.f_basetype[FSTYPSZ] (AIX, HP-UX, and Solaris).
    Others have statvfs.f_fstypename[_VFS_NAMELEN] (NetBSD 3.0).
    Others have statfs.f_fstypename[MFSNAMELEN] (NetBSD 1.5.2).
-   Still others have neither and have to get by with f_type (Linux).  */
+   Still others have neither and have to get by with f_type (Linux).
+   But f_type may only exist in statfs (Cygwin).  */
 static char const *
 human_fstype (STRUCT_STATVFS const *statfsbuf)
 {