Browse Source

switch on _KERNEL to load proper include file

OPENBSD_2_0
deraadt 28 years ago
parent
commit
6393fb019e
8 changed files with 43 additions and 11 deletions
  1. +6
    -2
      src/lib/libc/string/bcmp.c
  2. +5
    -1
      src/lib/libc/string/bzero.c
  3. +5
    -1
      src/lib/libc/string/ffs.c
  4. +6
    -2
      src/lib/libc/string/strcat.c
  5. +5
    -1
      src/lib/libc/string/strcmp.c
  6. +6
    -2
      src/lib/libc/string/strcpy.c
  7. +5
    -1
      src/lib/libc/string/strlen.c
  8. +5
    -1
      src/lib/libc/string/strncmp.c

+ 6
- 2
src/lib/libc/string/bcmp.c View File

@ -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. * Copyright (c) 1987 Regents of the University of California.
@ -35,10 +35,14 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)bcmp.c 5.6 (Berkeley) 2/24/91";*/ /*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 */ #endif /* LIBC_SCCS and not lint */
#ifndef _KERNEL
#include <string.h> #include <string.h>
#else
#include <lib/libkern/libkern.h>
#endif
/* /*
* bcmp -- vax cmpc3 instruction * bcmp -- vax cmpc3 instruction


+ 5
- 1
src/lib/libc/string/bzero.c View File

@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)bzero.c 5.7 (Berkeley) 2/24/91";*/ /*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 */ #endif /* LIBC_SCCS and not lint */
#ifndef _KERNEL
#include <string.h> #include <string.h>
#else
#include <lib/libkern/libkern.h>
#endif
/* /*
* bzero -- vax movc5 instruction * bzero -- vax movc5 instruction


+ 5
- 1
src/lib/libc/string/ffs.c View File

@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)ffs.c 5.4 (Berkeley) 5/17/90";*/ /*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 */ #endif /* LIBC_SCCS and not lint */
#ifndef _KERNEL
#include <string.h> #include <string.h>
#else
#include <lib/libkern/libkern.h>
#endif
/* /*
* ffs -- vax ffs instruction * ffs -- vax ffs instruction


+ 6
- 2
src/lib/libc/string/strcat.c View File

@ -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. * Copyright (c) 1988 Regents of the University of California.
@ -35,10 +35,14 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strcat.c 5.6 (Berkeley) 2/24/91";*/ /*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 */ #endif /* LIBC_SCCS and not lint */
#ifndef _KERNEL
#include <string.h> #include <string.h>
#else
#include <lib/libkern/libkern.h>
#endif
char * char *
strcat(s, append) strcat(s, append)


+ 5
- 1
src/lib/libc/string/strcmp.c View File

@ -36,10 +36,14 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strcmp.c 5.5 (Berkeley) 1/26/91";*/ /*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 */ #endif /* LIBC_SCCS and not lint */
#ifndef _KERNEL
#include <string.h> #include <string.h>
#else
#include <lib/libkern/libkern.h>
#endif
/* /*
* Compare strings. * Compare strings.


+ 6
- 2
src/lib/libc/string/strcpy.c View File

@ -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. * Copyright (c) 1988 Regents of the University of California.
@ -35,10 +35,14 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strcpy.c 5.7 (Berkeley) 2/24/91";*/ /*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 */ #endif /* LIBC_SCCS and not lint */
#ifndef _KERNEL
#include <string.h> #include <string.h>
#else
#include <lib/libkern/libkern.h>
#endif
char * char *
strcpy(to, from) strcpy(to, from)


+ 5
- 1
src/lib/libc/string/strlen.c View File

@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strlen.c 5.5 (Berkeley) 1/26/91";*/ /*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 */ #endif /* LIBC_SCCS and not lint */
#ifndef _KERNEL
#include <string.h> #include <string.h>
#else
#include <lib/libkern/libkern.h>
#endif
size_t size_t
strlen(str) strlen(str)


+ 5
- 1
src/lib/libc/string/strncmp.c View File

@ -33,10 +33,14 @@
#if defined(LIBC_SCCS) && !defined(lint) #if defined(LIBC_SCCS) && !defined(lint)
/*static char *sccsid = "from: @(#)strncmp.c 5.6 (Berkeley) 1/26/91";*/ /*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 */ #endif /* LIBC_SCCS and not lint */
#ifndef _KERNEL
#include <string.h> #include <string.h>
#else
#include <lib/libkern/libkern.h>
#endif
int int
strncmp(s1, s2, n) strncmp(s1, s2, n)


Loading…
Cancel
Save