From d53dc96704857625778f4692ed72ad0d6ff0df4e Mon Sep 17 00:00:00 2001 From: Andrew Borodin Date: Sun, 29 Jul 2012 12:37:14 +0400 Subject: [PATCH] Sync with gnulib ffe10f3d20c2eb77efd56b68f2c22b2a810c289d. fsusage: port back to Solaris * src/filemanager/mountlist.c (get_fs_usage): Fix busted logic causing compile-time error (fsd not declared) on Solaris 10. Signed-off-by: Andrew Borodin --- src/filemanager/mountlist.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/filemanager/mountlist.c b/src/filemanager/mountlist.c index de3411f9a..44b4a24d7 100644 --- a/src/filemanager/mountlist.c +++ b/src/filemanager/mountlist.c @@ -1496,8 +1496,9 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) #endif -#if (defined STAT_STATVFS64 \ - || (!defined STAT_STATFS2_FS_DATA && !defined STAT_READ_FILSYS)) +#if (defined STAT_STATVFS64 || defined STAT_STATFS3_OSF1 \ + || defined STAT_STATFS2_FRSIZE || defined STAT_STATFS2_BSIZE \ + || defined STAT_STATFS2_FSIZE || defined STAT_STATFS4) fsp->fsu_blocks = PROPAGATE_ALL_ONES (fsd.f_blocks); fsp->fsu_bfree = PROPAGATE_ALL_ONES (fsd.f_bfree); @@ -1508,6 +1509,7 @@ get_fs_usage (char const *file, char const *disk, struct fs_usage *fsp) #endif (void) disk; /* avoid argument-unused warning */ + return 0; } #endif /* HAVE_INFOMOUNT */ -- 2.11.4.GIT