From 7437486b3613a6bdf7f73334a4c4ceaf4539d8f8 Mon Sep 17 00:00:00 2001
From: Alexander Larsson <alexl@redhat.com>
Date: Fri, 14 Mar 2008 09:19:09 +0000
Subject: [PATCH] Use right define name 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

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

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


svn path=/trunk/; revision=6703
---
 ChangeLog        | 5 +++++
 configure.in     | 7 ++++++-
 gio/ChangeLog    | 6 ++++++
 gio/glocalfile.c | 2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 71d4ece..76d5a69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
 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>
+
+        * configure.in:
 	Added checks for FEN (Solaris  File Event Notification)
 
 2008-03-13  Tor Lillqvist  <tml@novell.com>
diff --git a/configure.in b/configure.in
index 2d6815c..77a01ad 100644
--- a/configure.in
+++ b/configure.in
@@ -842,7 +842,12 @@ AC_CHECK_MEMBERS([struct stat.st_mtimensec, struct stat.st_mtim.tv_nsec, struct
 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>
-#include <sys/mount.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 8b890ea..4922907 100644
--- a/gio/ChangeLog
+++ b/gio/ChangeLog
@@ -1,5 +1,11 @@
 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-14  Alexander Larsson  <alexl@redhat.com>
+
         * Makefile.am:
         * fen/Makefile.am: Added.
         * fen/fen-data.[ch]: Added.
diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 6f9221c..03e8669 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);
-- 
2.7.4