From 6393fb019e5bb2f2466273080eefa3d8ccc22d81 Mon Sep 17 00:00:00 2001 From: deraadt <> Date: Wed, 1 May 1996 12:57:54 +0000 Subject: [PATCH] switch on _KERNEL to load proper include file --- src/lib/libc/string/bcmp.c | 8 ++++++-- src/lib/libc/string/bzero.c | 6 +++++- src/lib/libc/string/ffs.c | 6 +++++- src/lib/libc/string/strcat.c | 8 ++++++-- src/lib/libc/string/strcmp.c | 6 +++++- src/lib/libc/string/strcpy.c | 8 ++++++-- src/lib/libc/string/strlen.c | 6 +++++- src/lib/libc/string/strncmp.c | 6 +++++- 8 files changed, 43 insertions(+), 11 deletions(-) diff --git a/src/lib/libc/string/bcmp.c b/src/lib/libc/string/bcmp.c index edd83c26..782aa1a3 100644 --- a/src/lib/libc/string/bcmp.c +++ b/src/lib/libc/string/bcmp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bcmp.c,v 1.2 1996/03/09 02:42:54 niklas Exp $ */ +/* $OpenBSD: bcmp.c,v 1.3 1996/05/01 12:57:37 deraadt Exp $ */ /* * Copyright (c) 1987 Regents of the University of California. @@ -35,10 +35,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.2 1996/03/09 02:42:54 niklas Exp $"; +static char *rcsid = "$Id: bcmp.c,v 1.3 1996/05/01 12:57:37 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ +#ifndef _KERNEL #include +#else +#include +#endif /* * bcmp -- vax cmpc3 instruction diff --git a/src/lib/libc/string/bzero.c b/src/lib/libc/string/bzero.c index 4865e396..7d89de23 100644 --- a/src/lib/libc/string/bzero.c +++ b/src/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.1.1.1 1995/10/18 08:42:21 deraadt Exp $"; +static char *rcsid = "$Id: bzero.c,v 1.2 1996/05/01 12:57:40 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ +#ifndef _KERNEL #include +#else +#include +#endif /* * bzero -- vax movc5 instruction diff --git a/src/lib/libc/string/ffs.c b/src/lib/libc/string/ffs.c index 42bc87dd..6a8ff265 100644 --- a/src/lib/libc/string/ffs.c +++ b/src/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.1.1.1 1995/10/18 08:42:21 deraadt Exp $"; +static char *rcsid = "$Id: ffs.c,v 1.2 1996/05/01 12:57:42 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ +#ifndef _KERNEL #include +#else +#include +#endif /* * ffs -- vax ffs instruction diff --git a/src/lib/libc/string/strcat.c b/src/lib/libc/string/strcat.c index 10e0aefe..2958d5e7 100644 --- a/src/lib/libc/string/strcat.c +++ b/src/lib/libc/string/strcat.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strcat.c,v 1.2 1996/03/09 02:42:56 niklas Exp $ */ +/* $OpenBSD: strcat.c,v 1.3 1996/05/01 12:57:45 deraadt Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. @@ -35,10 +35,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.2 1996/03/09 02:42:56 niklas Exp $"; +static char *rcsid = "$Id: strcat.c,v 1.3 1996/05/01 12:57:45 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ +#ifndef _KERNEL #include +#else +#include +#endif char * strcat(s, append) diff --git a/src/lib/libc/string/strcmp.c b/src/lib/libc/string/strcmp.c index ae19e2e2..690da8f3 100644 --- a/src/lib/libc/string/strcmp.c +++ b/src/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.1.1.1 1995/10/18 08:42:22 deraadt Exp $"; +static char *rcsid = "$Id: strcmp.c,v 1.2 1996/05/01 12:57:47 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ +#ifndef _KERNEL #include +#else +#include +#endif /* * Compare strings. diff --git a/src/lib/libc/string/strcpy.c b/src/lib/libc/string/strcpy.c index 86956cdb..04bf0fa6 100644 --- a/src/lib/libc/string/strcpy.c +++ b/src/lib/libc/string/strcpy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: strcpy.c,v 1.2 1996/03/09 02:42:57 niklas Exp $ */ +/* $OpenBSD: strcpy.c,v 1.3 1996/05/01 12:57:49 deraadt Exp $ */ /* * Copyright (c) 1988 Regents of the University of California. @@ -35,10 +35,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.2 1996/03/09 02:42:57 niklas Exp $"; +static char *rcsid = "$Id: strcpy.c,v 1.3 1996/05/01 12:57:49 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ +#ifndef _KERNEL #include +#else +#include +#endif char * strcpy(to, from) diff --git a/src/lib/libc/string/strlen.c b/src/lib/libc/string/strlen.c index d23aadaf..f5d526d9 100644 --- a/src/lib/libc/string/strlen.c +++ b/src/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.1.1.1 1995/10/18 08:42:22 deraadt Exp $"; +static char *rcsid = "$Id: strlen.c,v 1.2 1996/05/01 12:57:52 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ +#ifndef _KERNEL #include +#else +#include +#endif size_t strlen(str) diff --git a/src/lib/libc/string/strncmp.c b/src/lib/libc/string/strncmp.c index 0638d4dc..43217391 100644 --- a/src/lib/libc/string/strncmp.c +++ b/src/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.1.1.1 1995/10/18 08:42:23 deraadt Exp $"; +static char *rcsid = "$Id: strncmp.c,v 1.2 1996/05/01 12:57:54 deraadt Exp $"; #endif /* LIBC_SCCS and not lint */ +#ifndef _KERNEL #include +#else +#include +#endif int strncmp(s1, s2, n)