Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat/sunos make this compile again.
details: https://anonhg.NetBSD.org/src/rev/1c760144def7
branches: trunk
changeset: 965606:1c760144def7
user: christos <christos%NetBSD.org@localhost>
date: Mon Sep 23 21:07:50 2019 +0000
description:
make this compile again.
diffstat:
sys/compat/sunos/sunos_misc.c | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diffs (42 lines):
diff -r 62f7766c6ce1 -r 1c760144def7 sys/compat/sunos/sunos_misc.c
--- a/sys/compat/sunos/sunos_misc.c Mon Sep 23 21:07:39 2019 +0000
+++ b/sys/compat/sunos/sunos_misc.c Mon Sep 23 21:07:50 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sunos_misc.c,v 1.173 2019/07/03 18:24:50 dholland Exp $ */
+/* $NetBSD: sunos_misc.c,v 1.174 2019/09/23 21:07:50 christos Exp $ */
/*
* Copyright (c) 1992, 1993
@@ -50,7 +50,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.173 2019/07/03 18:24:50 dholland Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sunos_misc.c,v 1.174 2019/09/23 21:07:50 christos Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -277,8 +277,12 @@
}
na.timeo = sna.timeo;
na.retrans = sna.retrans;
- na.hostname = /* (char *)(u_long) */ sna.hostname;
-
+#ifdef __arch64__
+ /* XXX */
+ na.hostname = (char *)(intptr_t)sna.hostname;
+#else
+ na.hostname = sna.hostname;
+#endif
return do_sys_mount(l, "nfs", UIO_SYSSPACE,
SCARG(uap, dir), nflags, &na,
UIO_SYSSPACE, sizeof na, &dummy);
@@ -565,7 +569,7 @@
name = ipoptxlat[name - SUNOS_IP_MULTICAST_IF];
}
}
- if (SCARG(uap, valsize) > MLEN) {
+ if ((unsigned)SCARG(uap, valsize) > MLEN) {
error = EINVAL;
goto out;
}
Home |
Main Index |
Thread Index |
Old Index