diff options
| author | Ulrich Drepper <drepper@redhat.com> | 1999-10-09 21:56:43 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 1999-10-09 21:56:43 +0000 |
| commit | c1422e5b7cdb4400f934c91bcefa3a1a96d789fb (patch) | |
| tree | 7f8981b86c4ce4b5bb899f690eeb03d6645826a5 /string/strings.h | |
| parent | a4a1492eb94de4f5c5ec84a5898e994fca5f317b (diff) | |
Update.
Patch by khendricks@ivey.uwo.ca [libc/1382].
Diffstat (limited to 'string/strings.h')
| -rw-r--r-- | string/strings.h | 32 |
1 files changed, 19 insertions, 13 deletions
diff --git a/string/strings.h b/string/strings.h index 20a1af1d84..3fb92ded8f 100644 --- a/string/strings.h +++ b/string/strings.h @@ -1,4 +1,4 @@ -/* Copyright (C) 1991, 1992, 1996, 1997 Free Software Foundation, Inc. +/* Copyright (C) 1991, 1992, 1996, 1997, 1999 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -19,38 +19,44 @@ #ifndef _STRINGS_H #define _STRINGS_H 1 -#include <features.h> -#define __need_size_t -#include <stddef.h> +/* We don't need and should not read this file if <string.h> was already + read. */ +#ifndef _STRING_H + +# include <features.h> +# define __need_size_t +# include <stddef.h> __BEGIN_DECLS /* Compare N bytes of S1 and S2 (same as memcmp). */ -extern int bcmp __P ((__const __ptr_t __s1, __const __ptr_t __s2, size_t __n)); +extern int bcmp (__const void *__s1, __const void *__s2, size_t __n) __THROW; /* Copy N bytes of SRC to DEST (like memmove, but args reversed). */ -extern void bcopy __P ((__const __ptr_t __src, __ptr_t __dest, size_t __n)); +extern void bcopy (__const void *__src, void *__dest, size_t __n) __THROW; /* Set N bytes of S to 0. */ -extern void bzero __P ((__ptr_t __s, size_t __n)); +extern void bzero (void *__s, size_t __n) __THROW; /* Return the position of the first bit set in I, or 0 if none are set. The least-significant bit is position 1, the most-significant 32. */ -extern int ffs __P ((int __i)); +extern int ffs (int __i) __THROW; /* Find the first occurrence of C in S (same as strchr). */ -extern char *index __P ((__const char *__s, int __c)); +extern char *index (__const char *__s, int __c) __THROW; /* Find the last occurrence of C in S (same as strrchr). */ -extern char *rindex __P ((__const char *__s, int __c)); +extern char *rindex (__const char *__s, int __c) __THROW; /* Compare S1 and S2, ignoring case. */ -extern int strcasecmp __P ((__const char *__s1, __const char *__s2)); +extern int strcasecmp (__const char *__s1, __const char *__s2) __THROW; /* Compare no more than N chars of S1 and S2, ignoring case. */ -extern int strncasecmp __P ((__const char *__s1, __const char *__s2, - size_t __n)); +extern int strncasecmp (__const char *__s1, __const char *__s2, size_t __n) + __THROW; __END_DECLS +#endif /* string.h */ + #endif /* strings.h */ |