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

Merge branch 'statvfs-type' into 'main'

Browse Source 
glocalfile: Support statvfs.f_type

See merge request GNOME/glib!3893
This commit is contained in:
Michael Catanzaro 2024-02-07 14:24:52 +00:00
commit b7ef29560d
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gio/glocalfile.c
View File

@ -1089,6 +1089,8 @@ g_local_file_query_filesystem_info (GFile *file,
fstype = statfs_buffer.f_fstypename; fstype = statfs_buffer.f_fstypename;
#elif defined(HAVE_STRUCT_STATVFS_F_BASETYPE) #elif defined(HAVE_STRUCT_STATVFS_F_BASETYPE)
fstype = statfs_buffer.f_basetype; fstype = statfs_buffer.f_basetype;
#elif defined(HAVE_STRUCT_STATVFS_F_TYPE)
fstype = get_fs_type (statfs_buffer.f_type);
#else #else
fstype = NULL; fstype = NULL;
#endif #endif

1
meson.build
View File

@ -507,6 +507,7 @@ struct_members = [
#include <dirent.h>''' ], #include <dirent.h>''' ],
[ 'statvfs', 'f_basetype', '#include <sys/statvfs.h>' ], [ 'statvfs', 'f_basetype', '#include <sys/statvfs.h>' ],
[ 'statvfs', 'f_fstypename', '#include <sys/statvfs.h>' ], [ 'statvfs', 'f_fstypename', '#include <sys/statvfs.h>' ],
[ 'statvfs', 'f_type', '#include <sys/statvfs.h>' ],
[ 'tm', 'tm_gmtoff', '#include <time.h>' ], [ 'tm', 'tm_gmtoff', '#include <time.h>' ],
[ 'tm', '__tm_gmtoff', '#include <time.h>' ], [ 'tm', '__tm_gmtoff', '#include <time.h>' ],
] ]