summaryrefslogtreecommitdiff
path: root/lib/libc/string
diff options
context:
space:
mode:
authorcgd <cgd@NetBSD.org>1998-03-26 23:53:36 +0000
committercgd <cgd@NetBSD.org>1998-03-26 23:53:36 +0000
commit372e996fc3f2dc179b8b79fe09ecf5abd8ab0b0a (patch)
tree7b6250176efedf39071a16a51b1b9685770e471f /lib/libc/string
parentef8dc9789a013dbfe2a8c134d551856ef21fbb05 (diff)
when deciding whether to use standard system include files or libkern.h,
check _STANDALONE as well as _KERNEL. _KERNEL is incorrect for use when building boot blocks, and it looks like the rest of the code is already using _STANDALONE for this purpose.
Diffstat (limited to 'lib/libc/string')
-rw-r--r--lib/libc/string/bcmp.c6
-rw-r--r--lib/libc/string/bcopy.c6
-rw-r--r--lib/libc/string/bzero.c6
-rw-r--r--lib/libc/string/ffs.c6
-rw-r--r--lib/libc/string/index.c6
-rw-r--r--lib/libc/string/memchr.c6
-rw-r--r--lib/libc/string/memcmp.c6
-rw-r--r--lib/libc/string/memset.c6
-rw-r--r--lib/libc/string/rindex.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
15 files changed, 45 insertions, 45 deletions
diff --git a/lib/libc/string/bcmp.c b/lib/libc/string/bcmp.c
index ac58ff8911b..d21400ff753 100644
--- a/lib/libc/string/bcmp.c
+++ b/lib/libc/string/bcmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bcmp.c,v 1.9 1998/02/03 18:49:10 perry Exp $ */
+/* $NetBSD: bcmp.c,v 1.10 1998/03/26 23:53:36 cgd Exp $ */
/*
* Copyright (c) 1987, 1993
@@ -38,11 +38,11 @@
#if 0
static char sccsid[] = "@(#)bcmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: bcmp.c,v 1.9 1998/02/03 18:49:10 perry Exp $");
+__RCSID("$NetBSD: bcmp.c,v 1.10 1998/03/26 23:53:36 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/bcopy.c b/lib/libc/string/bcopy.c
index a748f912dbc..a1ca1233139 100644
--- a/lib/libc/string/bcopy.c
+++ b/lib/libc/string/bcopy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bcopy.c,v 1.9 1998/02/22 09:12:57 mycroft Exp $ */
+/* $NetBSD: bcopy.c,v 1.10 1998/03/26 23:53:36 cgd Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,11 +41,11 @@
#if 0
static char sccsid[] = "@(#)bcopy.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: bcopy.c,v 1.9 1998/02/22 09:12:57 mycroft Exp $");
+__RCSID("$NetBSD: bcopy.c,v 1.10 1998/03/26 23:53:36 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/bzero.c b/lib/libc/string/bzero.c
index 753a27c6cc7..b68942d9db9 100644
--- a/lib/libc/string/bzero.c
+++ b/lib/libc/string/bzero.c
@@ -1,4 +1,4 @@
-/* $NetBSD: bzero.c,v 1.6 1998/02/03 18:49:12 perry Exp $ */
+/* $NetBSD: bzero.c,v 1.7 1998/03/26 23:53:36 cgd Exp $ */
/*
* Copyright (c) 1987 Regents of the University of California.
@@ -38,11 +38,11 @@
#if 0
static char *sccsid = "@(#)bzero.c 5.7 (Berkeley) 2/24/91";
#else
-__RCSID("$NetBSD: bzero.c,v 1.6 1998/02/03 18:49:12 perry Exp $");
+__RCSID("$NetBSD: bzero.c,v 1.7 1998/03/26 23:53:36 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/ffs.c b/lib/libc/string/ffs.c
index 59618a1b07e..15e9cd50761 100644
--- a/lib/libc/string/ffs.c
+++ b/lib/libc/string/ffs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: ffs.c,v 1.8 1998/02/03 18:49:12 perry Exp $ */
+/* $NetBSD: ffs.c,v 1.9 1998/03/26 23:53:36 cgd Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,11 +38,11 @@
#if 0
static char sccsid[] = "@(#)ffs.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: ffs.c,v 1.8 1998/02/03 18:49:12 perry Exp $");
+__RCSID("$NetBSD: ffs.c,v 1.9 1998/03/26 23:53:36 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/index.c b/lib/libc/string/index.c
index aeaa2d55495..2f42c437f71 100644
--- a/lib/libc/string/index.c
+++ b/lib/libc/string/index.c
@@ -1,4 +1,4 @@
-/* $NetBSD: index.c,v 1.8 1998/02/03 18:49:13 perry Exp $ */
+/* $NetBSD: index.c,v 1.9 1998/03/26 23:53:36 cgd Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,11 +38,11 @@
#if 0
static char sccsid[] = "@(#)index.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: index.c,v 1.8 1998/02/03 18:49:13 perry Exp $");
+__RCSID("$NetBSD: index.c,v 1.9 1998/03/26 23:53:36 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/memchr.c b/lib/libc/string/memchr.c
index 6019269c262..217a7fec240 100644
--- a/lib/libc/string/memchr.c
+++ b/lib/libc/string/memchr.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memchr.c,v 1.8 1998/02/03 18:49:14 perry Exp $ */
+/* $NetBSD: memchr.c,v 1.9 1998/03/26 23:53:36 cgd Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,11 +41,11 @@
#if 0
static char sccsid[] = "@(#)memchr.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: memchr.c,v 1.8 1998/02/03 18:49:14 perry Exp $");
+__RCSID("$NetBSD: memchr.c,v 1.9 1998/03/26 23:53:36 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/memcmp.c b/lib/libc/string/memcmp.c
index 1aefc0697e0..eee37417df0 100644
--- a/lib/libc/string/memcmp.c
+++ b/lib/libc/string/memcmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memcmp.c,v 1.8 1998/02/03 18:49:15 perry Exp $ */
+/* $NetBSD: memcmp.c,v 1.9 1998/03/26 23:53:36 cgd Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,11 +41,11 @@
#if 0
static char sccsid[] = "@(#)memcmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: memcmp.c,v 1.8 1998/02/03 18:49:15 perry Exp $");
+__RCSID("$NetBSD: memcmp.c,v 1.9 1998/03/26 23:53:36 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/memset.c b/lib/libc/string/memset.c
index 412e4b63b9a..01780f8885a 100644
--- a/lib/libc/string/memset.c
+++ b/lib/libc/string/memset.c
@@ -1,4 +1,4 @@
-/* $NetBSD: memset.c,v 1.9 1998/02/04 09:01:44 thorpej Exp $ */
+/* $NetBSD: memset.c,v 1.10 1998/03/26 23:53:37 cgd Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,7 +41,7 @@
#if 0
static char sccsid[] = "@(#)memset.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: memset.c,v 1.9 1998/02/04 09:01:44 thorpej Exp $");
+__RCSID("$NetBSD: memset.c,v 1.10 1998/03/26 23:53:37 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
@@ -49,7 +49,7 @@ __RCSID("$NetBSD: memset.c,v 1.9 1998/02/04 09:01:44 thorpej Exp $");
#include <limits.h>
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/rindex.c b/lib/libc/string/rindex.c
index 06546bb1467..311581aad69 100644
--- a/lib/libc/string/rindex.c
+++ b/lib/libc/string/rindex.c
@@ -1,4 +1,4 @@
-/* $NetBSD: rindex.c,v 1.8 1998/02/03 18:49:16 perry Exp $ */
+/* $NetBSD: rindex.c,v 1.9 1998/03/26 23:53:37 cgd Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,11 +38,11 @@
#if 0
static char sccsid[] = "@(#)rindex.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: rindex.c,v 1.8 1998/02/03 18:49:16 perry Exp $");
+__RCSID("$NetBSD: rindex.c,v 1.9 1998/03/26 23:53:37 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/strcat.c b/lib/libc/string/strcat.c
index ea0d9750575..10716603b9f 100644
--- a/lib/libc/string/strcat.c
+++ b/lib/libc/string/strcat.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strcat.c,v 1.9 1998/02/03 18:49:17 perry Exp $ */
+/* $NetBSD: strcat.c,v 1.10 1998/03/26 23:53:37 cgd Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,11 +38,11 @@
#if 0
static char sccsid[] = "@(#)strcat.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strcat.c,v 1.9 1998/02/03 18:49:17 perry Exp $");
+__RCSID("$NetBSD: strcat.c,v 1.10 1998/03/26 23:53:37 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/strcmp.c b/lib/libc/string/strcmp.c
index c27593d6e9e..cf3b97420c5 100644
--- a/lib/libc/string/strcmp.c
+++ b/lib/libc/string/strcmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strcmp.c,v 1.9 1998/02/03 18:49:18 perry Exp $ */
+/* $NetBSD: strcmp.c,v 1.10 1998/03/26 23:53:37 cgd Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,11 +41,11 @@
#if 0
static char sccsid[] = "@(#)strcmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strcmp.c,v 1.9 1998/02/03 18:49:18 perry Exp $");
+__RCSID("$NetBSD: strcmp.c,v 1.10 1998/03/26 23:53:37 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/strcpy.c b/lib/libc/string/strcpy.c
index 19acc10a681..4ee0e5e21e3 100644
--- a/lib/libc/string/strcpy.c
+++ b/lib/libc/string/strcpy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strcpy.c,v 1.9 1998/02/03 18:49:18 perry Exp $ */
+/* $NetBSD: strcpy.c,v 1.10 1998/03/26 23:53:37 cgd Exp $ */
/*
* Copyright (c) 1988, 1993
@@ -38,11 +38,11 @@
#if 0
static char sccsid[] = "@(#)strcpy.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strcpy.c,v 1.9 1998/02/03 18:49:18 perry Exp $");
+__RCSID("$NetBSD: strcpy.c,v 1.10 1998/03/26 23:53:37 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/strlen.c b/lib/libc/string/strlen.c
index ae5046539f4..d1fd9104134 100644
--- a/lib/libc/string/strlen.c
+++ b/lib/libc/string/strlen.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strlen.c,v 1.8 1998/02/03 18:49:20 perry Exp $ */
+/* $NetBSD: strlen.c,v 1.9 1998/03/26 23:53:37 cgd Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -38,11 +38,11 @@
#if 0
static char sccsid[] = "@(#)strlen.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strlen.c,v 1.8 1998/02/03 18:49:20 perry Exp $");
+__RCSID("$NetBSD: strlen.c,v 1.9 1998/03/26 23:53:37 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/strncmp.c b/lib/libc/string/strncmp.c
index f45a12d435d..e1209b77944 100644
--- a/lib/libc/string/strncmp.c
+++ b/lib/libc/string/strncmp.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strncmp.c,v 1.9 1998/02/03 18:49:21 perry Exp $ */
+/* $NetBSD: strncmp.c,v 1.10 1998/03/26 23:53:37 cgd Exp $ */
/*
* Copyright (c) 1989, 1993
@@ -38,11 +38,11 @@
#if 0
static char sccsid[] = "@(#)strncmp.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strncmp.c,v 1.9 1998/02/03 18:49:21 perry Exp $");
+__RCSID("$NetBSD: strncmp.c,v 1.10 1998/03/26 23:53:37 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>
diff --git a/lib/libc/string/strncpy.c b/lib/libc/string/strncpy.c
index 2aa0817d75e..4060d0428ae 100644
--- a/lib/libc/string/strncpy.c
+++ b/lib/libc/string/strncpy.c
@@ -1,4 +1,4 @@
-/* $NetBSD: strncpy.c,v 1.8 1998/02/03 18:49:22 perry Exp $ */
+/* $NetBSD: strncpy.c,v 1.9 1998/03/26 23:53:37 cgd Exp $ */
/*-
* Copyright (c) 1990, 1993
@@ -41,11 +41,11 @@
#if 0
static char sccsid[] = "@(#)strncpy.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: strncpy.c,v 1.8 1998/02/03 18:49:22 perry Exp $");
+__RCSID("$NetBSD: strncpy.c,v 1.9 1998/03/26 23:53:37 cgd Exp $");
#endif
#endif /* LIBC_SCCS and not lint */
-#ifndef _KERNEL
+#if !defined(_KERNEL) && !defined(_STANDALONE)
#include <string.h>
#else
#include <lib/libkern/libkern.h>