From c6e52984495d26e76832fcbb650a2c78d37d7238 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 14 Mar 2008 09:28:17 +0000
Subject: [PATCH] Add required includes for f_fstypename member check.

2008-03-14  Alexander Larsson  <alexl@redhat.com>

        * configure.in:
	Add required includes for f_fstypename member check.

2008-03-14  Alexander Larsson  <alexl@redhat.com>

        * glocalfile.c:
        (g_local_file_query_filesystem_info):
	Use right define name for f_fstypename member check


svn path=/branches/glib-2-16/; revision=6704
---
 ChangeLog        |  5 +++++
 configure.in     | 10 +++++++++-
 gio/ChangeLog    |  6 ++++++
 gio/glocalfile.c |  2 +-
 4 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 310bb59e6..28e17c4c5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-14  Alexander Larsson  <alexl@redhat.com>
+
+        * configure.in:
+	Add required includes for f_fstypename member check.
+
 2008-03-12  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	Bug 316221 - G_LOCK warns about breaking strict-aliasing rules
diff --git a/configure.in b/configure.in
index 22ac45565..17e10063c 100644
--- a/configure.in
+++ b/configure.in
@@ -839,7 +839,15 @@ 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])
+AC_CHECK_MEMBERS([struct stat.st_blksize, struct stat.st_blocks, struct statfs.f_fstypename], [#include <sys/types.h>
+#include <sys/stat.h>
+#include <unistd.h>
+#ifdef HAVE_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_MOUNT_H
+#include <sys/mount.h>
+#endif])
 
 # Checks for libcharset
 jm_LANGINFO_CODESET
diff --git a/gio/ChangeLog b/gio/ChangeLog
index ccc58ee6e..b40fa6b96 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,3 +1,9 @@
+2008-03-14  Alexander Larsson  <alexl@redhat.com>
+
+        * glocalfile.c:
+        (g_local_file_query_filesystem_info):
+	Use right define name for f_fstypename member check
+
 2008-03-12  Tor Lillqvist  <tml@novell.com>
 
 	* glocalfile.c (_g_local_file_has_trash_dir): Implement as empty,
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 6f9221c34..03e866994 100644
--- a/gio/glocalfile.c
+++ b/gio/glocalfile.c
@@ -1001,7 +1001,7 @@ g_local_file_query_filesystem_info (GFile         *file,
 #endif
     }
 #ifdef USE_STATFS
-#if defined(HAVE_STRUCT_STATFS_FS_TYPENAME)
+#if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
   fstype = g_strdup(statfs_buffer.f_fstypename);
 #else
   fstype = get_fs_type (statfs_buffer.f_type);