Re: Check mc build on other OS before release.

[Paul Eggert]

On 07/12/2012 11:47 PM, Andrew Borodin wrote:
> Currently mc code synced with recent fsusage module of gnulib is not compiled
> on Solaris.

Thanks for reporting that.  I installed the following fix into the
gnulib trunk.

---
 ChangeLog     |    7 +++++++
 lib/fsusage.c |    5 +++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 1494ef2..8f76052 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-07-20  Paul Eggert  <egg...@cs.ucla.edu>
+
+       fsusage: port back to Solaris
+       * lib/fsusage.c (get_fs_usage): Fix busted logic causing compile-time
+       error (fsd not declared) on Solaris 10.  Reported privately by
+       Andrew Borodin.
+
 2012-07-19  Akim Demaille  <a...@lrde.epita.fr>
 
        gnu-web-doc-update: fix error messages
diff --git a/lib/fsusage.c b/lib/fsusage.c
index 1f282e0..f02d63f 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -286,8 +286,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);
-- 
1.7.6.5