Update.

	Patch by khendricks@ivey.uwo.ca [libc/1382].

5 files changed, 193 insertions, 194 deletions

diff --git a/string/argz.h b/string/argz.h
index 4b25cc071b..a90da9a147 100644
--- a/string/argz.h
+++ b/string/argz.h
@@ -1,6 +1,5 @@
 /* Routines for dealing with '\0' separated arg vectors.
-   Copyright (C) 1995, 96, 97, 98 Free Software Foundation, Inc.
-   Written by Miles Bader <miles@gnu.org>
+   Copyright (C) 1995, 96, 97, 98, 99 Free Software Foundation, Inc.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -40,76 +39,74 @@ __BEGIN_DECLS
 /* Make a '\0' separated arg vector from a unix argv vector, returning it in
    ARGZ, and the total length in LEN.  If a memory allocation error occurs,
    ENOMEM is returned, otherwise 0.  The result can be destroyed using free. */
-extern error_t __argz_create __P ((char *__const __argv[],
-				   char **__restrict __argz,
-				   size_t *__restrict __len));
-extern error_t argz_create __P ((char *__const __argv[],
-				 char **__restrict __argz,
-				 size_t *__restrict __len));
+extern error_t __argz_create (char *__const __argv[], char **__restrict __argz,
+			      size_t *__restrict __len) __THROW;
+extern error_t argz_create (char *__const __argv[], char **__restrict __argz,
+			    size_t *__restrict __len) __THROW;
 
 /* Make a '\0' separated arg vector from a SEP separated list in
    STRING, returning it in ARGZ, and the total length in LEN.  If a
    memory allocation error occurs, ENOMEM is returned, otherwise 0.
    The result can be destroyed using free.  */
-extern error_t __argz_create_sep __P ((__const char *__restrict __string,
-				       int __sep, char **__restrict __argz,
-				       size_t *__restrict __len));
-extern error_t argz_create_sep __P ((__const char *__restrict __string,
-				     int __sep, char **__restrict __argz,
-				     size_t *__restrict __len));
+extern error_t __argz_create_sep (__const char *__restrict __string,
+				  int __sep, char **__restrict __argz,
+				  size_t *__restrict __len) __THROW;
+extern error_t argz_create_sep (__const char *__restrict __string,
+				int __sep, char **__restrict __argz,
+				size_t *__restrict __len) __THROW;
 
 /* Returns the number of strings in ARGZ.  */
-extern size_t __argz_count __P ((__const char *__argz, size_t __len));
-extern size_t argz_count __P ((__const char *__argz, size_t __len));
+extern size_t __argz_count (__const char *__argz, size_t __len) __THROW;
+extern size_t argz_count (__const char *__argz, size_t __len) __THROW;
 
 /* Puts pointers to each string in ARGZ into ARGV, which must be large enough
    to hold them all.  */
-extern void __argz_extract __P ((__const char *__restrict __argz, size_t __len,
-				 char **__restrict __argv));
-extern void argz_extract __P ((__const char *__restrict __argz, size_t __len,
-			       char **__restrict __argv));
+extern void __argz_extract (__const char *__restrict __argz, size_t __len,
+			    char **__restrict __argv) __THROW;
+extern void argz_extract (__const char *__restrict __argz, size_t __len,
+			  char **__restrict __argv) __THROW;
 
 /* Make '\0' separated arg vector ARGZ printable by converting all the '\0's
    except the last into the character SEP.  */
-extern void __argz_stringify __P ((char *__argz, size_t __len, int __sep));
-extern void argz_stringify __P ((char *__argz, size_t __len, int __sep));
+extern void __argz_stringify (char *__argz, size_t __len, int __sep) __THROW;
+extern void argz_stringify (char *__argz, size_t __len, int __sep) __THROW;
 
 /* Append BUF, of length BUF_LEN to the argz vector in ARGZ & ARGZ_LEN.  */
-extern error_t __argz_append __P ((char **__restrict __argz,
-				   size_t *__restrict __argz_len,
-				   __const char *__restrict __buf,
-				   size_t _buf_len));
-extern error_t argz_append __P ((char **__restrict __argz,
-				 size_t *__restrict __argz_len,
-				 __const char *__restrict __buf,
-				 size_t __buf_len));
+extern error_t __argz_append (char **__restrict __argz,
+			      size_t *__restrict __argz_len,
+			      __const char *__restrict __buf, size_t _buf_len)
+     __THROW;
+extern error_t argz_append (char **__restrict __argz,
+			    size_t *__restrict __argz_len,
+			    __const char *__restrict __buf, size_t __buf_len)
+     __THROW;
 
 /* Append STR to the argz vector in ARGZ & ARGZ_LEN.  */
-extern error_t __argz_add __P ((char **__restrict __argz,
-				size_t *__restrict __argz_len,
-				__const char *__restrict __str));
-extern error_t argz_add __P ((char **__restrict __argz,
-			      size_t *__restrict __argz_len,
-			      __const char *__restrict __str));
+extern error_t __argz_add (char **__restrict __argz,
+			   size_t *__restrict __argz_len,
+			   __const char *__restrict __str) __THROW;
+extern error_t argz_add (char **__restrict __argz,
+			 size_t *__restrict __argz_len,
+			 __const char *__restrict __str) __THROW;
 
 /* Append SEP separated list in STRING to the argz vector in ARGZ &
    ARGZ_LEN.  */
-extern error_t __argz_add_sep __P ((char **__restrict __argz,
-				    size_t *__restrict __argz_len,
-				    __const char *__restrict __string,
-				    int __delim));
-extern error_t argz_add_sep __P ((char **__restrict __argz,
-				  size_t *__restrict __argz_len,
-				  __const char *__restrict __string,
-				  int __delim));
+extern error_t __argz_add_sep (char **__restrict __argz,
+			       size_t *__restrict __argz_len,
+			       __const char *__restrict __string, int __delim)
+     __THROW;
+extern error_t argz_add_sep (char **__restrict __argz,
+			     size_t *__restrict __argz_len,
+			     __const char *__restrict __string, int __delim)
+     __THROW;
 
 /* Delete ENTRY from ARGZ & ARGZ_LEN, if it appears there.  */
-extern void __argz_delete __P ((char **__restrict __argz,
-				size_t *__restrict __argz_len,
-				char *__restrict __entry));
-extern void argz_delete __P ((char **__restrict __argz,
-			      size_t *__restrict __argz_len,
-			      char *__restrict __entry));
+extern void __argz_delete (char **__restrict __argz,
+			   size_t *__restrict __argz_len,
+			   char *__restrict __entry) __THROW;
+extern void argz_delete (char **__restrict __argz,
+			 size_t *__restrict __argz_len,
+			 char *__restrict __entry) __THROW;
 
 /* Insert ENTRY into ARGZ & ARGZ_LEN before BEFORE, which should be an
    existing entry in ARGZ; if BEFORE is NULL, ENTRY is appended to the end.
@@ -117,14 +114,14 @@ extern void argz_delete __P ((char **__restrict __argz,
    ARGZ, ENTRY) will insert ENTRY at the beginning of ARGZ.  If BEFORE is not
    in ARGZ, EINVAL is returned, else if memory can't be allocated for the new
    ARGZ, ENOMEM is returned, else 0.  */
-extern error_t __argz_insert __P ((char **__restrict __argz,
-				   size_t *__restrict __argz_len,
-				   char *__restrict __before,
-				   __const char *__restrict __entry));
-extern error_t argz_insert __P ((char **__restrict __argz,
-				 size_t *__restrict __argz_len,
-				 char *__restrict __before,
-				 __const char *__restrict __entry));
+extern error_t __argz_insert (char **__restrict __argz,
+			      size_t *__restrict __argz_len,
+			      char *__restrict __before,
+			      __const char *__restrict __entry) __THROW;
+extern error_t argz_insert (char **__restrict __argz,
+			    size_t *__restrict __argz_len,
+			    char *__restrict __before,
+			    __const char *__restrict __entry) __THROW;
 
 /* Replace any occurances of the string STR in ARGZ with WITH, reallocating
    ARGZ as necessary.  If REPLACE_COUNT is non-zero, *REPLACE_COUNT will be
@@ -154,12 +151,10 @@ extern error_t argz_replace (char **__restrict __argz,
     for (entry = argz; entry; entry = argz_next (argz, argz_len, entry))
       ...;
 */
-extern char *__argz_next __P ((__const char *__restrict __argz,
-			       size_t __argz_len,
-			       __const char *__restrict __entry));
-extern char *argz_next __P ((__const char *__restrict __argz,
-			     size_t __argz_len,
-			     __const char *__restrict __entry));
+extern char *__argz_next (__const char *__restrict __argz, size_t __argz_len,
+			  __const char *__restrict __entry) __THROW;
+extern char *argz_next (__const char *__restrict __argz, size_t __argz_len,
+			__const char *__restrict __entry) __THROW;
 
 #ifdef __USE_EXTERN_INLINES
 extern inline char *
diff --git a/string/bits/string2.h b/string/bits/string2.h
index 902e924cb0..e01560988e 100644
--- a/string/bits/string2.h
+++ b/string/bits/string2.h
@@ -368,7 +368,7 @@ __mempcpy_small (void *__dest, char __src1,
 
 /* Return pointer to C in S.  */
 #ifndef _HAVE_STRING_ARCH_strchr
-extern __ptr_t __rawmemchr (const __ptr_t __s, int __c);
+extern void *__rawmemchr (const void *__s, int __c);
 # define strchr(s, c) \
   (__extension__ (__builtin_constant_p (c) && (c) == '\0'		      \
 		  ? (char *) __rawmemchr (s, c)				      \
diff --git a/string/envz.h b/string/envz.h
index f9a8e6934f..1595a95658 100644
--- a/string/envz.h
+++ b/string/envz.h
@@ -1,6 +1,5 @@
 /* Routines for dealing with '\0' separated environment vectors
-   Copyright (C) 1995, 1996, 1998 Free Software Foundation, Inc.
-   Written by Miles Bader <miles@gnu.ai.mit.edu>
+   Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc.
 
    The GNU C Library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public License as
@@ -31,14 +30,13 @@
 __BEGIN_DECLS
 
 /* Returns a pointer to the entry in ENVZ for NAME, or 0 if there is none.  */
-extern char *envz_entry __P ((__const char *__restrict __envz,
-			      size_t __envz_len,
-			      __const char *__restrict __name));
+extern char *envz_entry (__const char *__restrict __envz, size_t __envz_len,
+			 __const char *__restrict __name) __THROW;
 
 /* Returns a pointer to the value portion of the entry in ENVZ for NAME, or 0
    if there is none.  */
-extern char *envz_get __P ((__const char *__restrict __envz, size_t __envz_len,
-			    __const char *__restrict __name));
+extern char *envz_get (__const char *__restrict __envz, size_t __envz_len,
+		       __const char *__restrict __name) __THROW;
 
 /* Adds an entry for NAME with value VALUE to ENVZ & ENVZ_LEN.  If an entry
    with the same name already exists in ENVZ, it is removed.  If VALUE is
@@ -46,27 +44,27 @@ extern char *envz_get __P ((__const char *__restrict __envz, size_t __envz_len,
    return NULL, although envz_entry will still return an entry; this is handy
    because when merging with another envz, the null entry can override an
    entry in the other one.  Null entries can be removed with envz_strip ().  */
-extern error_t envz_add __P ((char **__restrict __envz,
-			      size_t *__restrict __envz_len,
-			      __const char *__restrict __name,
-			      __const char *__restrict __value));
+extern error_t envz_add (char **__restrict __envz,
+			 size_t *__restrict __envz_len,
+			 __const char *__restrict __name,
+			 __const char *__restrict __value) __THROW;
 
 /* Adds each entry in ENVZ2 to ENVZ & ENVZ_LEN, as if with envz_add().  If
    OVERRIDE is true, then values in ENVZ2 will supersede those with the same
    name in ENV, otherwise not.  */
-extern error_t envz_merge __P ((char **__restrict __envz,
-				size_t *__restrict __envz_len,
-				__const char *__restrict __envz2,
-				size_t __envz2_len, int __override));
+extern error_t envz_merge (char **__restrict __envz,
+			   size_t *__restrict __envz_len,
+			   __const char *__restrict __envz2,
+			   size_t __envz2_len, int __override) __THROW;
 
 /* Remove the entry for NAME from ENVZ & ENVZ_LEN, if any.  */
-extern void envz_remove __P ((char **__restrict __envz,
-			      size_t *__restrict __envz_len,
-			      __const char *__restrict __name));
+extern void envz_remove (char **__restrict __envz,
+			 size_t *__restrict __envz_len,
+			 __const char *__restrict __name) __THROW;
 
 /* Remove null entries.  */
-extern void envz_strip __P ((char **__restrict __envz,
-			     size_t *__restrict __envz_len));
+extern void envz_strip (char **__restrict __envz,
+			size_t *__restrict __envz_len) __THROW;
 
 __END_DECLS
 
diff --git a/string/string.h b/string/string.h
index a09d42a207..4a8ba402f8 100644
--- a/string/string.h
+++ b/string/string.h
@@ -34,66 +34,67 @@ __BEGIN_DECLS
 
 
 /* Copy N bytes of SRC to DEST.  */
-extern __ptr_t memcpy __P ((__ptr_t __restrict __dest,
-			    __const __ptr_t __restrict __src, size_t __n));
+extern void *memcpy (void *__restrict __dest,
+		     __const void *__restrict __src, size_t __n) __THROW;
 /* Copy N bytes of SRC to DEST, guaranteeing
    correct behavior for overlapping strings.  */
-extern __ptr_t memmove __P ((__ptr_t __dest, __const __ptr_t __src,
-			     size_t __n));
+extern void *memmove (void *__dest, __const void *__src, size_t __n)
+     __THROW;
 
 /* Copy no more than N bytes of SRC to DEST, stopping when C is found.
    Return the position in DEST one byte past where C was copied,
    or NULL if C was not found in the first N bytes of SRC.  */
 #if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN
-extern __ptr_t memccpy __P ((__ptr_t __dest, __const __ptr_t __src,
-			     int __c, size_t __n));
+extern void *memccpy (void *__dest, __const void *__src, int __c, size_t __n)
+     __THROW;
 #endif /* SVID.  */
 
 
 /* Set N bytes of S to C.  */
-extern __ptr_t memset __P ((__ptr_t __s, int __c, size_t __n));
+extern void *memset (void *__s, int __c, size_t __n) __THROW;
 
 /* Compare N bytes of S1 and S2.  */
-extern int memcmp __P ((__const __ptr_t __s1, __const __ptr_t __s2,
-			size_t __n));
+extern int memcmp (__const void *__s1, __const void *__s2, size_t __n)
+     __THROW;
 
 /* Search N bytes of S for C.  */
-extern __ptr_t memchr __P ((__const __ptr_t __s, int __c, size_t __n));
+extern void *memchr (__const void *__s, int __c, size_t __n) __THROW;
 
 #ifdef __USE_GNU
 /* Search in S for C.  This is similar to `memchr' but there is no
    length limit.  */
-extern __ptr_t rawmemchr __P ((__const __ptr_t __s, int __c));
+extern void *rawmemchr (__const void *__s, int __c) __THROW;
 
 /* Search N bytes of S for the final occurrence of C.  */
-extern __ptr_t memrchr __P ((__const __ptr_t __s, int __c, size_t __n));
+extern void *memrchr (__const void *__s, int __c, size_t __n) __THROW;
 #endif
 
 
 /* Copy SRC to DEST.  */
-extern char *strcpy __P ((char *__restrict __dest,
-			  __const char *__restrict __src));
+extern char *strcpy (char *__restrict __dest, __const char *__restrict __src)
+     __THROW;
 /* Copy no more than N characters of SRC to DEST.  */
-extern char *strncpy __P ((char *__restrict __dest,
-			   __const char *__restrict __src, size_t __n));
+extern char *strncpy (char *__restrict __dest,
+		      __const char *__restrict __src, size_t __n) __THROW;
 
 /* Append SRC onto DEST.  */
-extern char *strcat __P ((char *__restrict __dest,
-			  __const char *__restrict __src));
+extern char *strcat (char *__restrict __dest, __const char *__restrict __src)
+     __THROW;
 /* Append no more than N characters from SRC onto DEST.  */
-extern char *strncat __P ((char *__restrict __dest,
-			   __const char *__restrict __src, size_t __n));
+extern char *strncat (char *__restrict __dest, __const char *__restrict __src,
+		      size_t __n) __THROW;
 
 /* Compare S1 and S2.  */
-extern int strcmp __P ((__const char *__s1, __const char *__s2));
+extern int strcmp (__const char *__s1, __const char *__s2) __THROW;
 /* Compare N characters of S1 and S2.  */
-extern int strncmp __P ((__const char *__s1, __const char *__s2, size_t __n));
+extern int strncmp (__const char *__s1, __const char *__s2, size_t __n)
+     __THROW;
 
 /* Compare the collated forms of S1 and S2.  */
-extern int strcoll __P ((__const char *__s1, __const char *__s2));
+extern int strcoll (__const char *__s1, __const char *__s2) __THROW;
 /* Put a transformation of SRC into no more than N bytes of DEST.  */
-extern size_t strxfrm __P ((char *__restrict __dest,
-			    __const char *__restrict __src, size_t __n));
+extern size_t strxfrm (char *__restrict __dest,
+		       __const char *__restrict __src, size_t __n) __THROW;
 
 #ifdef __USE_GNU
 /* The following functions are equivalent to the both above but they
@@ -102,24 +103,24 @@ extern size_t strxfrm __P ((char *__restrict __dest,
 # include <xlocale.h>
 
 /* Compare the collated forms of S1 and S2 using rules from L.  */
-extern int __strcoll_l __P ((__const char *__s1, __const char *__s2,
-			     __locale_t __l));
+extern int __strcoll_l (__const char *__s1, __const char *__s2, __locale_t __l)
+     __THROW;
 /* Put a transformation of SRC into no more than N bytes of DEST.  */
-extern size_t __strxfrm_l __P ((char *__dest, __const char *__src, size_t __n,
-				__locale_t __l));
+extern size_t __strxfrm_l (char *__dest, __const char *__src, size_t __n,
+			   __locale_t __l) __THROW;
 #endif
 
 #if defined __USE_SVID || defined __USE_BSD || defined __USE_XOPEN_EXTENDED
 /* Duplicate S, returning an identical malloc'd string.  */
-extern char *__strdup __P ((__const char *__s));
-extern char *strdup __P ((__const char *__s));
+extern char *__strdup (__const char *__s) __THROW;
+extern char *strdup (__const char *__s) __THROW;
 #endif
 
 /* Return a malloc'd copy of at most N bytes of STRING.  The
    resultant string is terminated even if no null terminator
    appears before STRING[N].  */
 #if defined __USE_GNU
-extern char *strndup __P ((__const char *__string, size_t __n));
+extern char *strndup (__const char *__string, size_t __n) __THROW;
 #endif
 
 #if defined __USE_GNU && defined __GNUC__
@@ -146,178 +147,177 @@ extern char *strndup __P ((__const char *__string, size_t __n));
 #endif
 
 /* Find the first occurrence of C in S.  */
-extern char *strchr __P ((__const char *__s, int __c));
+extern char *strchr (__const char *__s, int __c) __THROW;
 /* Find the last occurrence of C in S.  */
-extern char *strrchr __P ((__const char *__s, int __c));
+extern char *strrchr (__const char *__s, int __c) __THROW;
 
 #ifdef __USE_GNU
 /* This funciton is similar to `strchr'.  But it returns a pointer to
    the closing NUL byte in case C is not found in S.  */
-extern char *strchrnul __P ((__const char *__s, int __c));
+extern char *strchrnul (__const char *__s, int __c) __THROW;
 #endif
 
 /* Return the length of the initial segment of S which
    consists entirely of characters not in REJECT.  */
-extern size_t strcspn __P ((__const char *__s, __const char *__reject));
+extern size_t strcspn (__const char *__s, __const char *__reject) __THROW;
 /* Return the length of the initial segment of S which
    consists entirely of characters in ACCEPT.  */
-extern size_t strspn __P ((__const char *__s, __const char *__accept));
+extern size_t strspn (__const char *__s, __const char *__accept) __THROW;
 /* Find the first occurrence in S of any character in ACCEPT.  */
-extern char *strpbrk __P ((__const char *__s, __const char *__accept));
+extern char *strpbrk (__const char *__s, __const char *__accept) __THROW;
 /* Find the first occurrence of NEEDLE in HAYSTACK.  */
-extern char *strstr __P ((__const char *__haystack, __const char *__needle));
+extern char *strstr (__const char *__haystack, __const char *__needle) __THROW;
 
 #ifdef __USE_GNU
 /* Similar to `strstr' but this function ignores the case of both strings.  */
-extern char *__strcasestr __P ((__const char *__haystack,
-				__const char *__needle));
-extern char *strcasestr __P ((__const char *__haystack,
-			      __const char *__needle));
+extern char *__strcasestr (__const char *__haystack, __const char *__needle)
+     __THROW;
+extern char *strcasestr (__const char *__haystack, __const char *__needle)
+     __THROW;
 #endif
 
 /* Divide S into tokens separated by characters in DELIM.  */
-extern char *strtok __P ((char *__restrict __s,
-			  __const char *__restrict __delim));
+extern char *strtok (char *__restrict __s, __const char *__restrict __delim)
+     __THROW;
 
 /* Divide S into tokens separated by characters in DELIM.  Information
    passed between calls are stored in SAVE_PTR.  */
-extern char *__strtok_r __P ((char *__restrict __s,
-			      __const char *__restrict __delim,
-			      char **__restrict __save_ptr));
+extern char *__strtok_r (char *__restrict __s,
+			 __const char *__restrict __delim,
+			 char **__restrict __save_ptr) __THROW;
 #if defined __USE_POSIX || defined __USE_MISC
-extern char *strtok_r __P ((char *__restrict __s,
-			    __const char *__restrict __delim,
-			    char **__restrict __save_ptr));
+extern char *strtok_r (char *__restrict __s, __const char *__restrict __delim,
+		       char **__restrict __save_ptr) __THROW;
 #endif
 
 #ifdef __USE_GNU
 /* Find the first occurrence of NEEDLE in HAYSTACK.
    NEEDLE is NEEDLELEN bytes long;
    HAYSTACK is HAYSTACKLEN bytes long.  */
-extern __ptr_t memmem __P ((__const __ptr_t __haystack, size_t __haystacklen,
-			    __const __ptr_t __needle, size_t __needlelen));
+extern void *memmem (__const void *__haystack, size_t __haystacklen,
+		     __const void *__needle, size_t __needlelen) __THROW;
 
 /* Copy N bytes of SRC to DEST, return pointer to bytes after the
    last written byte.  */
-extern __ptr_t __mempcpy __P ((__ptr_t __restrict __dest,
-			       __const __ptr_t __restrict __src, size_t __n));
-extern __ptr_t mempcpy __P ((__ptr_t __restrict __dest,
-			     __const __ptr_t __restrict __src, size_t __n));
+extern void *__mempcpy (void *__restrict __dest,
+			__const void *__restrict __src, size_t __n) __THROW;
+extern void *mempcpy (void *__restrict __dest,
+		      __const void *__restrict __src, size_t __n) __THROW;
 #endif
 
 
 /* Return the length of S.  */
-extern size_t strlen __P ((__const char *__s));
+extern size_t strlen (__const char *__s) __THROW;
 
 #ifdef	__USE_GNU
 /* Find the length of STRING, but scan at most MAXLEN characters.
    If no '\0' terminator is found in that many characters, return MAXLEN.  */
-extern size_t strnlen __P ((__const char *__string, size_t __maxlen));
+extern size_t strnlen (__const char *__string, size_t __maxlen) __THROW;
 #endif
 
 
 /* Return a string describing the meaning of the `errno' code in ERRNUM.  */
-extern char *strerror __P ((int __errnum));
+extern char *strerror (int __errnum) __THROW;
 #ifdef	__USE_MISC
 /* Reentrant version of `strerror'.  If a temporary buffer is required, at
    most BUFLEN bytes of BUF will be used.  */
-extern char *__strerror_r __P ((int __errnum, char *__buf, size_t __buflen));
-extern char *strerror_r __P ((int __errnum, char *__buf, size_t __buflen));
+extern char *__strerror_r (int __errnum, char *__buf, size_t __buflen) __THROW;
+extern char *strerror_r (int __errnum, char *__buf, size_t __buflen) __THROW;
 #endif
 
 /* We define this function always since `bzero' is sometimes needed when
    the namespace rules does not allow this.  */
-extern void __bzero __P ((__ptr_t __s, size_t __n));
+extern void __bzero (void *__s, size_t __n) __THROW;
 
 #if defined __USE_BSD || defined __USE_XOPEN_EXTENDED
 /* 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;
 
 /* 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;
 
 /* 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;
 
 /* 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)) __attribute__ ((const));
-extern int ffs __P ((int __i)) __attribute__ ((const));
+extern int __ffs (int __i) __THROW __attribute__ ((const));
+extern int ffs (int __i) __THROW __attribute__ ((const));
 
 /* The following two functions are non-standard but necessary for non-32 bit
    platforms.  */
 # ifdef	__USE_GNU
-extern int ffsl __P ((long int __l)) __attribute__ ((const));
+extern int ffsl (long int __l) __THROW __attribute__ ((const));
 #  ifdef __GNUC__
-__extension__ extern int ffsll __P ((long long int __ll))
-     __attribute__ ((const));
+__extension__ extern int ffsll (long long int __ll)
+     __THROW __attribute__ ((const));
 #  endif
 # endif
 
 /* Compare S1 and S2, ignoring case.  */
-extern int __strcasecmp __P ((__const char *__s1, __const char *__s2));
-extern int strcasecmp __P ((__const char *__s1, __const char *__s2));
+extern int __strcasecmp (__const char *__s1, __const char *__s2) __THROW;
+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;
 #endif /* Use BSD or X/Open Unix.  */
 
 #ifdef	__USE_GNU
 /* Again versions of a few functions which use the given locale instead
    of the global one.  */
-extern int __strcasecmp_l __P ((__const char *__s1, __const char *__s2,
-				__locale_t __loc));
+extern int __strcasecmp_l (__const char *__s1, __const char *__s2,
+			   __locale_t __loc) __THROW;
 
-extern int __strncasecmp_l __P ((__const char *__s1, __const char *__s2,
-				 size_t __n, __locale_t __loc));
+extern int __strncasecmp_l (__const char *__s1, __const char *__s2,
+			    size_t __n, __locale_t __loc) __THROW;
 #endif
 
 #ifdef	__USE_BSD
 /* Return the next DELIM-delimited token from *STRINGP,
    terminating it with a '\0', and update *STRINGP to point past it.  */
-extern char *strsep __P ((char **__restrict __stringp,
-			  __const char *__restrict __delim));
+extern char *strsep (char **__restrict __stringp,
+		     __const char *__restrict __delim) __THROW;
 #endif
 
 #ifdef	__USE_GNU
 /* Compare S1 and S2 as strings holding name & indices/version numbers.  */
-extern int strverscmp __P ((__const char *__s1, __const char *__s2));
+extern int strverscmp (__const char *__s1, __const char *__s2) __THROW;
 
 /* Return a string describing the meaning of the signal number in SIG.  */
-extern char *strsignal __P ((int __sig));
+extern char *strsignal (int __sig) __THROW;
 
 /* Copy SRC to DEST, returning the address of the terminating '\0' in DEST.  */
-extern char *__stpcpy __P ((char *__restrict __dest,
-			    __const char *__restrict __src));
-extern char *stpcpy __P ((char *__restrict __dest,
-			  __const char *__restrict __src));
+extern char *__stpcpy (char *__restrict __dest, __const char *__restrict __src)
+     __THROW;
+extern char *stpcpy (char *__restrict __dest, __const char *__restrict __src)
+     __THROW;
 
 /* Copy no more than N characters of SRC to DEST, returning the address of
    the last character written into DEST.  */
-extern char *__stpncpy __P ((char *__restrict __dest,
-			     __const char *__restrict __src, size_t __n));
-extern char *stpncpy __P ((char *__restrict __dest,
-			   __const char *__restrict __src, size_t __n));
+extern char *__stpncpy (char *__restrict __dest,
+			__const char *__restrict __src, size_t __n) __THROW;
+extern char *stpncpy (char *__restrict __dest,
+		      __const char *__restrict __src, size_t __n) __THROW;
 
 /* Sautee STRING briskly.  */
-extern char *strfry __P ((char *__string));
+extern char *strfry (char *__string) __THROW;
 
 /* Frobnicate N bytes of S.  */
-extern __ptr_t memfrob __P ((__ptr_t __s, size_t __n));
+extern void *memfrob (void *__s, size_t __n) __THROW;
 
 # ifndef basename
 /* Return the file name within directory of FILENAME.  We don't
    declare the function if the `basename' macro is available (defined
    in <libgen.h>) which makes the XPG version of this function
    available.  */
-extern char *basename __P ((__const char *__filename));
+extern char *basename (__const char *__filename) __THROW;
 # endif
 #endif
 
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  */