summaryrefslogtreecommitdiffstats
path: root/sys/lib/libkern/arch
diff options
context:
space:
mode:
authorniklas <niklas@openbsd.org>1996-04-19 16:08:13 +0000
committerniklas <niklas@openbsd.org>1996-04-19 16:08:13 +0000
commit0c0430f8be50281c74d9dc83e99431ec6557954b (patch)
treeafa225701d5d148fcc2f938d8b48ae7e0389ceef /sys/lib/libkern/arch
parentFix a bit, so it's now compiles. (diff)
downloadwireguard-openbsd-0c0430f8be50281c74d9dc83e99431ec6557954b.tar.xz
wireguard-openbsd-0c0430f8be50281c74d9dc83e99431ec6557954b.zip
NetBSD 960317 merge
Diffstat (limited to 'sys/lib/libkern/arch')
-rw-r--r--sys/lib/libkern/arch/i386/Makefile.inc3
-rw-r--r--sys/lib/libkern/arch/sparc/memset.c5
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/lib/libkern/arch/i386/Makefile.inc b/sys/lib/libkern/arch/i386/Makefile.inc
index cbeec30a509..a39aac330eb 100644
--- a/sys/lib/libkern/arch/i386/Makefile.inc
+++ b/sys/lib/libkern/arch/i386/Makefile.inc
@@ -1,4 +1,5 @@
-# $NetBSD: Makefile.inc,v 1.7 1995/10/07 09:52:48 mycroft Exp $
+# $OpenBSD: Makefile.inc,v 1.3 1996/04/19 16:09:44 niklas Exp $
+# $NetBSD: Makefile.inc,v 1.9 1996/03/11 05:32:00 scottr Exp $
SRCS+= __main.c imax.c imin.c lmax.c lmin.c max.c min.c ulmax.c ulmin.c \
bcmp.S ffs.S memset.S strcat.S strcmp.S strcpy.S strlen.S strncmp.c \
diff --git a/sys/lib/libkern/arch/sparc/memset.c b/sys/lib/libkern/arch/sparc/memset.c
index 8b208c7e970..af092288f49 100644
--- a/sys/lib/libkern/arch/sparc/memset.c
+++ b/sys/lib/libkern/arch/sparc/memset.c
@@ -1,4 +1,5 @@
-/* $NetBSD: memset.c,v 1.2 1994/10/26 06:40:00 cgd Exp $ */
+/* $OpenBSD: memset.c,v 1.2 1996/04/19 16:09:46 niklas Exp $ */
+/* $NetBSD: memset.c,v 1.4 1996/03/11 05:46:51 scottr Exp $ */
/*-
* Copyright (c) 1990 The Regents of the University of California.
@@ -40,7 +41,7 @@
#ifdef notdef
static char *sccsid = "@(#)memset.c 5.6 (Berkeley) 1/26/91";
#endif
-static char *rcsid = "$NetBSD: memset.c,v 1.2 1994/10/26 06:40:00 cgd Exp $";
+static char *rcsid = "$NetBSD: memset.c,v 1.4 1996/03/11 05:46:51 scottr Exp $";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>