Re: coreutils-6.0: compilation failure on NetBSD 3.0 (2)

[Eric Blake]

> 
> Thanks for this patch; I installed it into both gnulib and coreutils.
> 
> Eric, this seems to supersede the Cygwin-related patch
> <http://savannah.gnu.org/bugs/?func=detailitem&item_id=16325> that I
> installed into CVS coreutils recently (revision 1.95, date: 2006-08-15
> 16:23:28 -0700), so for now I backed out that older patch.  Once the
> fix has propagated into Savannah, can you please verify this when you
> have the time?  Thanks.

Oh well, 6.1 does not compile out of the box on cygwin.  Your patch
did indeed break compilation again.

2006-08-20  Eric Blake  <address@hidden>

        * src/stat.c (USE_STATVFS): Reinstate the patch from 2006-08-15;
        the patch from 2006-08-18 broke on cygwin.

Index: src/stat.c
===================================================================
RCS file: /sources/coreutils/coreutils/src/stat.c,v
retrieving revision 1.96
diff -u -p -r1.96 stat.c
--- src/stat.c  18 Aug 2006 18:36:06 -0000      1.96
+++ src/stat.c  20 Aug 2006 13:14:38 -0000
@@ -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)
 {