diff options
| author | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-19 16:10:53 +0000 |
|---|---|---|
| committer | Niklas Hallqvist <niklas@cvs.openbsd.org> | 1996-04-19 16:10:53 +0000 |
| commit | 7c4cfc5c047725e6c4c20e9adaa1ef4e70ff68d1 (patch) | |
| tree | d415490c429995abee8d4ce27fac8216028a989c /sys/lib/libkern/arch | |
| parent | 6b3902486151983e34413a0e5a4bead588217855 (diff) | |
NetBSD 960317 merge
Diffstat (limited to 'sys/lib/libkern/arch')
| -rw-r--r-- | sys/lib/libkern/arch/i386/Makefile.inc | 3 | ||||
| -rw-r--r-- | sys/lib/libkern/arch/sparc/memset.c | 5 |
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> |