a02e6fca9c
Overview of changes in GLib 2.60.3 * Various fixes to small key/value support in GHashTable * Bugs fixed: - Critical in g_socket_client_async_connect_complete - New GHashTable implementation confuses valgrind - test_month_names: assertion failed - GNetworkAddressAddressEnumerator unsafely modifies cache in GNetworkAddress - Leaks in gsocketclient.c connection code - glib/date test fails - GDB pretty-printer for GHashTable no longer works - !815 Merge branch 'wip/tingping/socketclient-cancel-2' into 'master' - !816 Backport !814 “gschema.dtd: Add target attribute to alias” to glib-2-60 - !826 Backport !824 “gsocketclient: Fix a leak in the connection code” to glib-2-60 - !829 Backport !828 “build: Fix a typo in the test whether _NL_ABALTMON_n is supported” to glib-2-60 - !834 Backport !823 "gnetworkaddress: Fix parallel enumerations interfering with eachother" to glib-2-60 - !838 Backport !835 “Fix typo in German translation” to glib-2-60 - !841 Backport !839 “tests: Update month name check for Greek locale” to glib-2-60 - !844 Backport !840 “ghash: Disable small-arrays under valgrind” to glib-2-60 - !846 Backport !845 “Fixing g_format_size_full() on Windows-x64” to glib-2-60 - !855 Backport !848 (more GHashTable fixes) to glib-2-60 - !858 Backport !852 “Update gdb pretty-printer for GHashTable” to glib-2-60 * Translation updates: - German
17 lines
777 B
C
17 lines
777 B
C
$NetBSD: patch-gio_gunixmounts.c,v 1.5 2019/06/06 11:05:12 adam Exp $
|
|
|
|
SunOS has sys/mntent.h but no mnt_opts.
|
|
XXX who else uses the sys/mntent.h case?
|
|
https://gitlab.gnome.org/GNOME/glib/merge_requests/890
|
|
|
|
--- gio/gunixmounts.c.orig 2019-05-03 13:43:28.000000000 +0000
|
|
+++ gio/gunixmounts.c
|
|
@@ -736,7 +736,7 @@ _g_get_unix_mounts (void)
|
|
mntent.mnt_mountp,
|
|
NULL,
|
|
mntent.mnt_fstype,
|
|
- mntent.mnt_opts,
|
|
+ mntent.mnt_mntopts,
|
|
is_read_only);
|
|
|
|
return_list = g_list_prepend (return_list, mount_entry);
|