From 563eb127486d337cf5aef58637328220a5c9fcc8 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Wed, 2 Jul 2008 16:49:04 +0000 Subject: [PATCH] Use a configure check for structfs.f_bavail. * glocalfile.c: Use a configure check for structfs.f_bavail. svn path=/trunk/; revision=7144 --- ChangeLog | 4 ++++ configure.in | 2 +- gio/ChangeLog | 6 ++++++ gio/glocalfile.c | 4 ++-- 4 files changed, 13 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index a668f2b3..87097e2d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2008-07-02 Matthias Clasen + + * configure.in: Add a check for structfs.f_bavail + 2008-07-02 Matthias Clasen * glib/gmain.c (g_get_current_time): Add a g_return_val_if_fail diff --git a/configure.in b/configure.in index d5a7044e..ac6db4b2 100644 --- a/configure.in +++ b/configure.in @@ -831,7 +831,7 @@ AC_CHECK_HEADERS([mntent.h sys/mnttab.h sys/vfstab.h sys/mntctl.h sys/sysctl.h f # check for structure fields AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct stat.st_atimensec, struct stat.st_atim.tv_nsec, struct stat.st_ctimensec, struct stat.st_ctim.tv_nsec]) -AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename],,, [#include +AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename, struct statfs.f_bavail],,, [#include #include #include #ifdef HAVE_SYS_PARAM_H diff --git a/gio/ChangeLog b/gio/ChangeLog index 126828d7..723a216a 100644 --- a/gio/ChangeLog +++ b/gio/ChangeLog @@ -1,3 +1,9 @@ +2008-07-02 Matthias Clasen + + 536733 – gio build failure on Irix + + * glocalfile.c: Use a configure check for structfs.f_bavail. + 2008-07-02 Matthias Clasen Bug 534639 – add g_desktop_app_info_new_from_keyfile diff --git a/gio/glocalfile.c b/gio/glocalfile.c index e0bee8d8..634a38a2 100644 --- a/gio/glocalfile.c +++ b/gio/glocalfile.c @@ -53,8 +53,8 @@ #if defined(HAVE_STATFS) && defined(HAVE_STATVFS) /* Some systems have both statfs and statvfs, pick the most "native" for these */ -# if defined(sun) && defined(__SVR4) - /* on solaris, statfs doesn't even have the +# if !defined(HAVE_STRUCT_STATFS_F_BAVAIL) + /* on solaris and irix, statfs doesn't even have the f_bavail field */ # define USE_STATVFS # else -- 2.34.1