From 86fec8887f30f8f21f305ccd28eeadd7803ad688 Mon Sep 17 00:00:00 2001
From: mickey <mickey@openbsd.org>
Date: Sun, 3 Mar 1996 05:26:21 +0000
Subject: [PATCH] Makefiles seemed to be broken a bit, i don't even know how it
 happens to work still ... probably nobody rebuilt libcompat.a. Fron NetBSD:
 kern_info_*.c, seemed to be a bug fix.

---
 sys/compat/common/Makefile       |  4 ++--
 sys/compat/common/Makefile.inc   |  4 ++--
 sys/compat/common/kern_info_09.c |  9 +++++----
 sys/compat/common/kern_info_43.c | 11 +++++------
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/sys/compat/common/Makefile b/sys/compat/common/Makefile
index dc438e880ff..100a36d00d2 100644
--- a/sys/compat/common/Makefile
+++ b/sys/compat/common/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.3 1996/02/26 23:26:48 niklas Exp $
+#	$OpenBSD: Makefile,v 1.4 1996/03/03 05:26:21 mickey Exp $
 #	$NetBSD: Makefile,v 1.7 1996/02/05 01:58:28 christos Exp $
 
 LIB=	compat
 NOPIC=
 
-CPPFLAGS=	${COMPATCPPFLAGS:S@-I.@-I${COMPATREL}.@g}
+CPPFLAGS=	${COMPATCPPFLAGS:S/-I./-I${COMPATREL}./g}
 
 .PATH:	${COMPATREL}${COMPATDIR}
 
diff --git a/sys/compat/common/Makefile.inc b/sys/compat/common/Makefile.inc
index 4e5a5f9b4c4..032e72e56b5 100644
--- a/sys/compat/common/Makefile.inc
+++ b/sys/compat/common/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.2 1996/02/26 23:26:49 niklas Exp $
+#	$OpenBSD: Makefile.inc,v 1.3 1996/03/03 05:26:22 mickey Exp $
 #	$NetBSD: Makefile.inc,v 1.3 1996/02/02 20:34:44 mycroft Exp $
 #
 #	NOTE: $S must correspond to the top of the 'sys' tree
@@ -12,7 +12,7 @@ COMPATLIB_PROF=	${COMPATDST}/libcompat_p.a
 
 COMPATMAKE= \
 	cd ${COMPATDST} && ${MAKE} -f ${COMPATREL}${COMPATDIR}/Makefile \
-	    CC="${CC}" CFLAGS="${CFLAGS}" \
+	    CC="${CC}" CFLAGS="${CFLAGS:S/-I./-I${COMPATREL}./g}" \
 	    LD="${LD}" \
 	    COMPATCPPFLAGS="${CPPFLAGS}" \
 	    COMPATREL="${COMPATREL}" \
diff --git a/sys/compat/common/kern_info_09.c b/sys/compat/common/kern_info_09.c
index b9188999a44..e0e568c5186 100644
--- a/sys/compat/common/kern_info_09.c
+++ b/sys/compat/common/kern_info_09.c
@@ -1,5 +1,5 @@
-/*	$OpenBSD: kern_info_09.c,v 1.2 1996/02/26 23:26:51 niklas Exp $	*/
-/*	$NetBSD: kern_info_09.c,v 1.4 1996/02/04 02:02:14 christos Exp $	*/
+/*	$OpenBSD: kern_info_09.c,v 1.3 1996/03/03 05:26:22 mickey Exp $	*/
+/*	$NetBSD: kern_info_09.c,v 1.5 1996/02/21 00:10:59 cgd Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1991, 1993
@@ -61,10 +61,11 @@ compat_09_sys_getdomainname(p, v, retval)
 		syscallarg(int) len;
 	} */ *uap = v;
 	int name;
+	size_t sz;
 
 	name = KERN_DOMAINNAME;
-	return (kern_sysctl(&name, 1, SCARG(uap, domainname),
-			    &SCARG(uap, len), 0, 0, p));
+	sz = SCARG(uap,len);
+	return (kern_sysctl(&name, 1, SCARG(uap, domainname), &sz, 0, 0, p));
 }
 
 
diff --git a/sys/compat/common/kern_info_43.c b/sys/compat/common/kern_info_43.c
index 9e98382ccfe..d5e1da49527 100644
--- a/sys/compat/common/kern_info_43.c
+++ b/sys/compat/common/kern_info_43.c
@@ -1,7 +1,5 @@
-/*	$Id: kern_info_43.c,v 1.4 1996/02/26 23:26:52 niklas Exp $ */
-
-/*	$OpenBSD: kern_info_43.c,v 1.4 1996/02/26 23:26:52 niklas Exp $	*/
-/*	$NetBSD: kern_info_43.c,v 1.4 1996/02/04 02:02:22 christos Exp $	*/
+/*	$OpenBSD: kern_info_43.c,v 1.5 1996/03/03 05:26:23 mickey Exp $	*/
+/*	$NetBSD: kern_info_43.c,v 1.5 1996/02/04 02:02:22 christos Exp $	*/
 
 /*
  * Copyright (c) 1982, 1986, 1991, 1993
@@ -97,10 +95,11 @@ compat_43_sys_gethostname(p, v, retval)
 		syscallarg(u_int) len;
 	} */ *uap = v;
 	int name;
+	size_t sz;
 
 	name = KERN_HOSTNAME;
-	return (kern_sysctl(&name, 1, SCARG(uap, hostname), &SCARG(uap, len),
-			    0, 0, p));
+	sz = SCARG(uap, len);
+	return (kern_sysctl(&name, 1, SCARG(uap, hostname), &sz, 0, 0, p));
 }
 
 #define	KINFO_PROC		(0<<8)
-- 
2.20.1