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

diff --git a/ChangeLog b/ChangeLog
index 71d4ecef7fcd701a081c87b53c3df7f5945e1000..76d5a6985774a103a719065546fa5899f64c236f 100644 (file)
--- 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-14  Alexander Larsson  <alexl@redhat.com>
 
         * configure.in:

diff --git a/configure.in b/configure.in
index 2d6815c8f8f0f8ba89f8ebdf0ef4532a91e6d3f9..77a01adaf13617e80f35d1df2ac0f82366677888 100644 (file)
--- 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 8b890eaa914de6b14233d81d694ca575ad2894a0..492290754897a08fb12a95c3520dd7e458c96fdf 100644 (file)
--- 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-14  Alexander Larsson  <alexl@redhat.com>
 
         * Makefile.am:

diff --git a/gio/glocalfile.c b/gio/glocalfile.c
index 6f9221c34e2145ac6ef654f9d1a608d7a9477c1b..03e86699431fd1a67dab1e004deb7d51f3db8df5 100644 (file)
--- 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);