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
This commit is contained in:
Alexander Larsson 2008-03-14 09:28:17 +00:00 committed by Alexander Larsson
parent 0dc34bf29a
commit c6e5298449
4 changed files with 21 additions and 2 deletions

View File

@ -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

View File

@ -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

View File

@ -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,

View File

@ -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);