summaryrefslogtreecommitdiff
path: root/lib/libc/string
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>1996-04-18 02:30:07 +0000
committercgd <cgd@NetBSD.org>1996-04-18 02:30:07 +0000
commit57da02bd77ec84addf9bb089582c063781452f4c (patch)
treed9202c81a506ff656f933e94ad7012df6eacde44 /lib/libc/string
parent4a134a078027a5e66b0caebb34c370f5b1e0f6aa (diff)
don't include user-land headers compiling for libkern. (sync with libkern.)
Diffstat (limited to 'lib/libc/string')
-rw-r--r--lib/libc/string/bcmp.c6
-rw-r--r--lib/libc/string/bzero.c6
-rw-r--r--lib/libc/string/ffs.c6
-rw-r--r--lib/libc/string/strcat.c6
-rw-r--r--lib/libc/string/strcmp.c6
-rw-r--r--lib/libc/string/strcpy.c6
-rw-r--r--lib/libc/string/strlen.c6
-rw-r--r--lib/libc/string/strncmp.c6
-rw-r--r--lib/libc/string/strncpy.c6
9 files changed, 45 insertions, 9 deletions
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index dc0d655f508..38e39bff6ef 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)bcmp.c 5.6 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: bcmp.c,v 1.4 1996/02/04 23:43:54 jtc Exp $";
+static char *rcsid = "$Id: bcmp.c,v 1.5 1996/04/18 02:30:07 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
+#ifndef _KERNEL
#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
/*
* bcmp -- vax cmpc3 instruction
diff --git a/lib/libc/string/bzero.c b/lib/libc/string/bzero.c
index 99bd0fe22b8..5dd66f533ad 100644
--- a/lib/libc/string/bzero.c
+++ b/lib/libc/string/bzero.c
@@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)bzero.c 5.7 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: bzero.c,v 1.3 1993/08/26 00:51:37 jtc Exp $";
+static char *rcsid = "$Id: bzero.c,v 1.4 1996/04/18 02:30:09 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
+#ifndef _KERNEL
#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
/*
* bzero -- vax movc5 instruction
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index 752ad4bf6d5..e01f586fd30 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)ffs.c 5.4 (Berkeley) 5/17/90";*/
-static char *rcsid = "$Id: ffs.c,v 1.4 1995/06/15 00:07:20 jtc Exp $";
+static char *rcsid = "$Id: ffs.c,v 1.5 1996/04/18 02:30:10 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
+#ifndef _KERNEL
#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
/*
* ffs -- vax ffs instruction
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index 8f7cb08a0d2..63929f06a46 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strcat.c 5.6 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: strcat.c,v 1.4 1996/02/04 23:44:07 jtc Exp $";
+static char *rcsid = "$Id: strcat.c,v 1.5 1996/04/18 02:30:12 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
+#ifndef _KERNEL
#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
char *
strcat(s, append)
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index 5c77270532b..47a0bad11d9 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -36,10 +36,14 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strcmp.c 5.5 (Berkeley) 1/26/91";*/
-static char *rcsid = "$Id: strcmp.c,v 1.4 1995/06/15 00:07:40 jtc Exp $";
+static char *rcsid = "$Id: strcmp.c,v 1.5 1996/04/18 02:30:13 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
+#ifndef _KERNEL
#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
/*
* Compare strings.
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index ba1ca1eef7c..3cdd3b52082 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strcpy.c 5.7 (Berkeley) 2/24/91";*/
-static char *rcsid = "$Id: strcpy.c,v 1.5 1996/02/04 23:44:10 jtc Exp $";
+static char *rcsid = "$Id: strcpy.c,v 1.6 1996/04/18 02:30:14 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
+#ifndef _KERNEL
#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
char *
strcpy(to, from)
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index b244204837a..9a8653c9021 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strlen.c 5.5 (Berkeley) 1/26/91";*/
-static char *rcsid = "$Id: strlen.c,v 1.4 1995/06/15 00:08:00 jtc Exp $";
+static char *rcsid = "$Id: strlen.c,v 1.5 1996/04/18 02:30:15 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
+#ifndef _KERNEL
#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
size_t
strlen(str)
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index bc32fbc7799..93825bc004c 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strncmp.c 5.6 (Berkeley) 1/26/91";*/
-static char *rcsid = "$Id: strncmp.c,v 1.4 1995/06/15 00:08:14 jtc Exp $";
+static char *rcsid = "$Id: strncmp.c,v 1.5 1996/04/18 02:30:16 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
+#ifndef _KERNEL
#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
int
strncmp(s1, s2, n)
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index dd2f063c3b2..d5339201a7b 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -36,10 +36,14 @@
#if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strncpy.c 5.6 (Berkeley) 1/26/91";*/
-static char *rcsid = "$Id: strncpy.c,v 1.4 1995/06/15 00:08:20 jtc Exp $";
+static char *rcsid = "$Id: strncpy.c,v 1.5 1996/04/18 02:30:18 cgd Exp $";
#endif /* LIBC_SCCS and not lint */
+#ifndef _KERNEL
#include <string.h>
+#else
+#include <lib/libkern/libkern.h>
+#endif
/*
* Copy src to dst, truncating or null-padding to always copy n bytes.