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

Merge branch 'main' into 'main'

Browse Source 
Add support for QNX8.0

See merge request GNOME/glib!4466
This commit is contained in:
Philip Withnall 2025-02-03 15:10:06 +00:00
commit b9a4039271
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/gunixmounts.c
View File

@ -189,11 +189,13 @@ static GSource *proc_mounts_watch_source = NULL;
#include <fshelp.h> #include <fshelp.h>
#endif #endif
#if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) #if (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT) || defined(HAVE_GETFSENT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
#include <sys/param.h> #include <sys/param.h>
#include <sys/ucred.h>
#include <sys/mount.h> #include <sys/mount.h>
#include <fstab.h> #include <fstab.h>
#ifdef HAVE_SYS_UCRED_H
#include <sys/ucred.h>
#endif
#ifdef HAVE_SYS_SYSCTL_H #ifdef HAVE_SYS_SYSCTL_H
#include <sys/sysctl.h> #include <sys/sysctl.h>
#endif #endif
@ -1653,7 +1655,7 @@ _g_get_unix_mount_points (void)
return unix_mount_point_array_free_to_list (g_steal_pointer (&points), n_points); return unix_mount_point_array_free_to_list (g_steal_pointer (&points), n_points);
} }
#elif (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H) #elif (defined(HAVE_GETVFSSTAT) || defined(HAVE_GETFSSTAT) || defined(HAVE_GETFSENT)) && defined(HAVE_FSTAB_H) && defined(HAVE_SYS_MOUNT_H)
static GList * static GList *
_g_get_unix_mount_points (void) _g_get_unix_mount_points (void)

2
meson.build
View File

@ -435,6 +435,7 @@ headers = [
'sys/time.h', # MSC does not come with this by default 'sys/time.h', # MSC does not come with this by default
'sys/times.h', 'sys/times.h',
'sys/types.h', 'sys/types.h',
'sys/ucred.h',
'sys/uio.h', 'sys/uio.h',
'sys/vfs.h', 'sys/vfs.h',
'sys/vfstab.h', 'sys/vfstab.h',
@ -698,6 +699,7 @@ functions = [
'ftruncate64', 'ftruncate64',
'getauxval', 'getauxval',
'getc_unlocked', 'getc_unlocked',
'getfsent',
'getfsstat', 'getfsstat',
'getgrgid_r', 'getgrgid_r',
'getmntent_r', 'getmntent_r',