Mercurial > hg > octave-lojdl > gnulib-hg
changeset 17000:9fc45cd5d9b5
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.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Fri, 20 Jul 2012 01:39:19 -0700 |
| parents | 7f159c35dd5c |
| children | 47d115143a81 |
| files | ChangeLog lib/fsusage.c |
| diffstat | 2 files changed, 10 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2012-07-20 Paul Eggert <eggert@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 <akim@lrde.epita.fr> gnu-web-doc-update: fix error messages
--- a/lib/fsusage.c +++ b/lib/fsusage.c @@ -286,8 +286,9 @@ #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);