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

Merge branch 'backport-1146-solaris-fixes-glib-2-62' into 'glib-2-62'

Browse Source 
Backport !1146 Solaris fixes to glib-2-62

See merge request GNOME/glib!1156
This commit is contained in:
Philip Withnall 2019-10-08 09:23:56 +00:00
commit 5c1fe670bb
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gio/gunixmounts.c
View File

@ -165,6 +165,9 @@ static guint64 mount_poller_time = 0;
#endif #endif
#elif defined (HAVE_SYS_MNTTAB_H) #elif defined (HAVE_SYS_MNTTAB_H)
#include <sys/mnttab.h> #include <sys/mnttab.h>
#if defined(__sun) && !defined(mnt_opts)
#define mnt_opts mnt_mntopts
#endif
#endif #endif
#ifdef HAVE_SYS_VFSTAB_H #ifdef HAVE_SYS_VFSTAB_H

2
meson.build
View File

@ -2027,6 +2027,8 @@ elif host_system == 'cygwin'
export_dynamic_ldflags = ['-Wl,--export-all-symbols'] export_dynamic_ldflags = ['-Wl,--export-all-symbols']
elif host_system == 'darwin' elif host_system == 'darwin'
export_dynamic_ldflags = [] export_dynamic_ldflags = []
elif host_system == 'sunos'
export_dynamic_ldflags = []
else else
export_dynamic_ldflags = ['-Wl,--export-dynamic'] export_dynamic_ldflags = ['-Wl,--export-dynamic']
endif endif