[glib/glib-2-62: 1/3] gunixmounts: Handle Solaris name of mnt_mntopts in place of mnt_opts
- From: Philip Withnall <pwithnall src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib/glib-2-62: 1/3] gunixmounts: Handle Solaris name of mnt_mntopts in place of mnt_opts
- Date: Tue, 8 Oct 2019 09:24:13 +0000 (UTC)
commit 8e49fba3f336433b5f11fd16690672642950fbf9
Author: Alan Coopersmith <alan coopersmith oracle com>
Date: Fri Oct 4 12:55:14 2019 -0700
gunixmounts: Handle Solaris name of mnt_mntopts in place of mnt_opts
Fixes build failure:
../gio/gunixmounts.c: In function ‘_g_get_unix_mounts’:
../gio/gunixmounts.c:742:53: error: ‘struct mnttab’ has no member named ‘mnt_opts’; did you mean
‘mnt_mntopts’?
742 | mntent.mnt_opts,
| ^~~~~~~~
| mnt_mntopts
Signed-off-by: Alan Coopersmith <alan coopersmith oracle com>
gio/gunixmounts.c | 3 +++
1 file changed, 3 insertions(+)
---
diff --git a/gio/gunixmounts.c b/gio/gunixmounts.c
index cf73fe5e0..1e45a5b13 100644
--- a/gio/gunixmounts.c
+++ b/gio/gunixmounts.c
@@ -165,6 +165,9 @@ static guint64 mount_poller_time = 0;
#endif
#elif defined (HAVE_SYS_MNTTAB_H)
#include <sys/mnttab.h>
+#ifdef _sun
+#define mnt_opts mnt_mntopts
+#endif
#endif
#ifdef HAVE_SYS_VFSTAB_H
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]