glib r6703 - in trunk: . gio

[alexl svn gnome org]

Author: alexl
Date: Fri Mar 14 09:19:09 2008
New Revision: 6703
URL: http://svn.gnome.org/viewvc/glib?rev=6703&view=rev

Log:
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.
	


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/gio/ChangeLog
   trunk/gio/glocalfile.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Fri Mar 14 09:19:09 2008
@@ -842,7 +842,12 @@
 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

Modified: trunk/gio/glocalfile.c
==============================================================================
--- trunk/gio/glocalfile.c	(original)
+++ trunk/gio/glocalfile.c	Fri Mar 14 09:19:09 2008
@@ -1001,7 +1001,7 @@
 #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);