From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 24 Nov 1999 20:48:27 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/pre-glibc-2_1_3~136
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=8d2d51e373dd7c6c4a9b417a5bb7bdda3fe09b5f;p=platform%2Fupstream%2Fglibc.git

Update.

1999-11-24  Ulrich Drepper  <drepper@cygnus.com>

	* include/string.h: Remove K&R compatibility.
---

diff --git a/ChangeLog b/ChangeLog
index c3a1c51..e07fb94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+1999-11-24  Ulrich Drepper  <drepper@cygnus.com>
+
+	* include/string.h: Remove K&R compatibility.
+
 1999-11-23  Ulrich Drepper  <drepper@cygnus.com>
 
 	* sysdeps/unix/sysv/linux/bits/signum.h (SIGSYS): New definition.
diff --git a/include/string.h b/include/string.h
index 4cd64fb..5256bdc 100644
--- a/include/string.h
+++ b/include/string.h
@@ -1,25 +1,28 @@
 #ifndef _STRING_H
-#include <string/string.h>
 
-/* Now define the internal interfaces.  */
-extern __ptr_t __memccpy __P ((__ptr_t __dest, __const __ptr_t __src,
-			       int __c, size_t __n));
+#include <sys/types.h>
+
+extern void *__memccpy (void *__dest, __const void *__src,
+			  int __c, size_t __n);
 
-extern size_t __strnlen __P ((__const char *__string, size_t __maxlen));
+extern size_t __strnlen (__const char *__string, size_t __maxlen);
 
-extern char *__strsep __P ((char **__stringp, __const char *__delim));
+extern char *__strsep (char **__stringp, __const char *__delim);
 
-extern int __strverscmp __P ((__const char *__s1, __const char *__s2));
+extern int __strverscmp (__const char *__s1, __const char *__s2);
 
-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);
 
-extern char *__strndup __P ((__const char *__string, size_t __n));
+extern char *__strndup (__const char *__string, size_t __n);
 
-extern __ptr_t __rawmemchr __P ((__const __ptr_t __s, int __c));
+extern void *__rawmemchr (__const void *__s, int __c);
 
-extern char *__strchrnul __P ((__const char *__s, int __c));
+extern char *__strchrnul (__const char *__s, int __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);
 
+/* Now the real definitions.  We do this here since some of the functions
+   above are defined as macros in the headers.  */
+#include <string/string.h>
 #endif