[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: fsusage.c fails to build on GNU
From: |
Paul Eggert |
Subject: |
Re: fsusage.c fails to build on GNU |
Date: |
Mon, 02 Jul 2012 14:36:24 -0700 |
User-agent: |
Mozilla/5.0 (X11; Linux i686; rv:13.0) Gecko/20120615 Thunderbird/13.0.1 |
On 07/02/2012 02:35 PM, Paul Eggert wrote:
> Before I got your message,
> though, I had already installed the following more-conservative
> patch
Sorry, forgot the patch. Here it is:
>From defe57376249c1385b2874b43307e4c686a1d38c Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Mon, 2 Jul 2012 14:24:04 -0700
Subject: [PATCH] fsusage: include files needed for glibc 2.6 fallback
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* lib/fsusage.c [STAT_STATVFS || STAT_STATVFS64]:
Include <sys/param.h>, <sys/mount.h>, <sys/vfs.h>
as they are needed for the 2.6 < glibc/Linux < 2.6.36 fallback.
Problem reported by Ludovic Courtès in
<http://lists.gnu.org/archive/html/bug-gnulib/2012-07/msg00005.html>.
---
ChangeLog | 7 +++++++
lib/fsusage.c | 21 ++++++++++++---------
2 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index fda733e..47b1ae6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2012-07-02 Paul Eggert <address@hidden>
+ fsusage: include files needed for glibc 2.6 fallback
+ * lib/fsusage.c [STAT_STATVFS || STAT_STATVFS64]:
+ Include <sys/param.h>, <sys/mount.h>, <sys/vfs.h>
+ as they are needed for the 2.6 < glibc/Linux < 2.6.36 fallback.
+ Problem reported by Ludovic Courtès in
+ <http://lists.gnu.org/archive/html/bug-gnulib/2012-07/msg00005.html>.
+
fsusage: avoid needless check on GNU/Linux
* m4/fsusage.m4 (gl_FILE_SYSTEM_USAGE): Omit STAT_STATFS3_OSF1 check
on GNU/Linux systems, since it can't possibly work.
diff --git a/lib/fsusage.c b/lib/fsusage.c
index bca78cc..e273889 100644
--- a/lib/fsusage.c
+++ b/lib/fsusage.c
@@ -31,15 +31,6 @@
# include <fcntl.h>
# include <unistd.h>
# include <sys/stat.h>
-# if HAVE_SYS_PARAM_H
-# include <sys/param.h>
-# endif
-# if HAVE_SYS_MOUNT_H
-# include <sys/mount.h>
-# endif
-# if HAVE_SYS_VFS_H
-# include <sys/vfs.h>
-# endif
# if HAVE_SYS_FS_S5PARAM_H /* Fujitsu UXP/V */
# include <sys/fs/s5param.h>
# endif
@@ -55,6 +46,18 @@
# include "full-read.h"
#endif
+/* These files are needed for 2.6 < glibc/Linux < 2.6.36, even though
+ it has statvfs, because they are used by the fallback. */
+#if HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif
+#if HAVE_SYS_MOUNT_H
+# include <sys/mount.h>
+#endif
+#if HAVE_SYS_VFS_H
+# include <sys/vfs.h>
+#endif
+
/* The results of open() in this file are not used with fchdir,
therefore save some unnecessary work in fchdir.c. */
#undef open
--
1.7.6.5