sync with netbsd; missing SCARG() macros

3 files changed, 13 insertions, 11 deletions

diff --git a/sys/compat/ibcs2/ibcs2_misc.c b/sys/compat/ibcs2/ibcs2_misc.c
index 59bcee1414b..5a670f21125 100644
--- a/sys/compat/ibcs2/ibcs2_misc.c
+++ b/sys/compat/ibcs2/ibcs2_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ibcs2_misc.c,v 1.9 1997/06/17 11:11:09 deraadt Exp $	*/
+/*	$OpenBSD: ibcs2_misc.c,v 1.10 1997/09/11 10:48:14 deraadt Exp $	*/
 /*	$NetBSD: ibcs2_misc.c,v 1.23 1997/01/15 01:37:49 perry Exp $	*/
 
 /*
@@ -132,8 +132,8 @@ ibcs2_sys_ulimit(p, v, retval)
 	case IBCS2_SETFSIZE:	/* XXX - fix this */
 #ifdef notyet
 		rl.rlim_cur = SCARG(uap, newlimit);
-		sra.which = RLIMIT_FSIZE;
-		sra.rlp = &rl;
+		SCARG(&sra, which) = RLIMIT_FSIZE;
+		SCARG(&sra, rlp) = &rl;
 		error = setrlimit(p, &sra, retval);
 		if (!error)
 			*retval = p->p_rlimit[RLIMIT_FSIZE].rlim_cur;
@@ -148,7 +148,7 @@ ibcs2_sys_ulimit(p, v, retval)
 		*retval = p->p_rlimit[RLIMIT_RSS].rlim_cur; /* XXX */
 		return 0;
 	case IBCS2_GETDTABLESIZE:
-		uap->cmd = IBCS2_SC_OPEN_MAX;
+		SCARG(uap, cmd) = IBCS2_SC_OPEN_MAX;
 		return ibcs2_sys_sysconf(p, uap, retval);
 	default:
 		return ENOSYS;
diff --git a/sys/compat/svr4/svr4_misc.c b/sys/compat/svr4/svr4_misc.c
index 74b2a86659b..ef8910910a2 100644
--- a/sys/compat/svr4/svr4_misc.c
+++ b/sys/compat/svr4/svr4_misc.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_misc.c,v 1.10 1997/06/17 11:11:12 deraadt Exp $	 */
+/*	$OpenBSD: svr4_misc.c,v 1.11 1997/09/11 10:48:12 deraadt Exp $	 */
 /*	$NetBSD: svr4_misc.c,v 1.42 1996/12/06 03:22:34 christos Exp $	 */
 
 /*
@@ -718,8 +718,8 @@ svr4_sys_ulimit(p, v, retval)
 			if (error)
 				return error;
 
-			srl.which = RLIMIT_FSIZE;
-			srl.rlp = url;
+			SCARG(&srl, which) = RLIMIT_FSIZE;
+			SCARG(&srl, rlp) = url;
 
 			error = sys_setrlimit(p, &srl, retval);
 			if (error)
diff --git a/sys/compat/svr4/svr4_stream.c b/sys/compat/svr4/svr4_stream.c
index e5b2da12237..7675a1af6a5 100644
--- a/sys/compat/svr4/svr4_stream.c
+++ b/sys/compat/svr4/svr4_stream.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: svr4_stream.c,v 1.8 1997/08/07 09:16:21 niklas Exp $	 */
+/*	$OpenBSD: svr4_stream.c,v 1.9 1997/09/11 10:48:13 deraadt Exp $	 */
 /*	$NetBSD: svr4_stream.c,v 1.19 1996/12/22 23:00:03 fvdl Exp $	 */
 
 /*
@@ -1489,9 +1489,9 @@ svr4_sys_putmsg(p, v, retval)
 		{
 			struct sys_connect_args co;
 
-			co.s = SCARG(uap, fd);
-			co.name = (void *)sup;
-			co.namelen = (int)sasize;
+			SCARG(&co, s) = SCARG(uap, fd);
+			SCARG(&co, name) = (void *)sup;
+			SCARG(&co, namelen) = (int)sasize;
 			return sys_connect(p, &co, retval);
 		}
 
@@ -1499,6 +1499,7 @@ svr4_sys_putmsg(p, v, retval)
 		{
 			struct msghdr msg;
 			struct iovec aiov;
+
 			msg.msg_name = (caddr_t) sup;
 			msg.msg_namelen = sasize;
 			msg.msg_iov = &aiov;
@@ -1513,6 +1514,7 @@ svr4_sys_putmsg(p, v, retval)
 			*retval = 0;
 			return error;
 		}
+
 	default:
 		DPRINTF(("putmsg: Unimplemented command %lx\n", sc.cmd));
 		return ENOSYS;