luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-31 04:43:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'faccessat-bsd' into 'main'

Browse Source 
glocalfile: Disable faccessat()-based query_exists on FreeBSD

See merge request GNOME/glib!4366
This commit is contained in:
Philip Withnall 2024-11-06 13:13:01 +00:00
commit dbb42933f8
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gio/glocalfile.c
View File

@ -1259,7 +1259,9 @@ g_local_file_query_info (GFile *file,
return info; return info;
} }
#ifdef HAVE_FACCESSAT /* FIXME: faccessat() is available on FreeBSD but appears to not work correctly
* here. This needs diagnosing; https://gitlab.gnome.org/GNOME/glib/-/issues/3495 */
#if defined(HAVE_FACCESSAT) && !defined(__FreeBSD__)
static gboolean static gboolean
g_local_file_query_exists (GFile *file, g_local_file_query_exists (GFile *file,
GCancellable *cancellable) GCancellable *cancellable)
@ -3153,7 +3155,7 @@ g_local_file_file_iface_init (GFileIface *iface)
iface->monitor_dir = g_local_file_monitor_dir; iface->monitor_dir = g_local_file_monitor_dir;
iface->monitor_file = g_local_file_monitor_file; iface->monitor_file = g_local_file_monitor_file;
iface->measure_disk_usage = g_local_file_measure_disk_usage; iface->measure_disk_usage = g_local_file_measure_disk_usage;
#ifdef HAVE_FACCESSAT #if defined(HAVE_FACCESSAT) && !defined(__FreeBSD__)
iface->query_exists = g_local_file_query_exists; iface->query_exists = g_local_file_query_exists;
#endif #endif