luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-10-05 05:09:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add required includes for f_fstypename member check.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
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> 2008-03-12 Sebastian Dröge <slomo@circular-chaos.org>
Bug 316221 - G_LOCK warns about breaking strict-aliasing rules Bug 316221 - G_LOCK warns about breaking strict-aliasing rules

10
configure.in
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 # 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_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 # Checks for libcharset
jm_LANGINFO_CODESET jm_LANGINFO_CODESET

6
gio/ChangeLog
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> 2008-03-12 Tor Lillqvist <tml@novell.com>
* glocalfile.c (_g_local_file_has_trash_dir): Implement as empty, * glocalfile.c (_g_local_file_has_trash_dir): Implement as empty,

2
gio/glocalfile.c
View File

@@ -1001,7 +1001,7 @@ g_local_file_query_filesystem_info (GFile *file,
#endif #endif
} }
#ifdef USE_STATFS #ifdef USE_STATFS
#if defined(HAVE_STRUCT_STATFS_FS_TYPENAME) #if defined(HAVE_STRUCT_STATFS_F_FSTYPENAME)
fstype = g_strdup(statfs_buffer.f_fstypename); fstype = g_strdup(statfs_buffer.f_fstypename);
#else #else
fstype = get_fs_type (statfs_buffer.f_type); fstype = get_fs_type (statfs_buffer.f_type);