glib r6704 - in branches/glib-2-16: . gio

[alexl svn gnome org]

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

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



Modified:
   branches/glib-2-16/ChangeLog
   branches/glib-2-16/configure.in
   branches/glib-2-16/gio/ChangeLog
   branches/glib-2-16/gio/glocalfile.c

Modified: branches/glib-2-16/configure.in
==============================================================================
--- branches/glib-2-16/configure.in	(original)
+++ branches/glib-2-16/configure.in	Fri Mar 14 09:28:17 2008
@@ -839,7 +839,15 @@
 
 # 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

Modified: branches/glib-2-16/gio/glocalfile.c
==============================================================================
--- branches/glib-2-16/gio/glocalfile.c	(original)
+++ branches/glib-2-16/gio/glocalfile.c	Fri Mar 14 09:28:17 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);