ansification: remove _DEFUN

Signed-off-by: Yaakov Selkowitz <yselkowi@redhat.com>

85 files changed, 88 insertions, 175 deletions

diff --git a/newlib/libc/string/bcmp.c b/newlib/libc/string/bcmp.c
index 29afe82..747f8af 100644
--- a/newlib/libc/string/bcmp.c
+++ b/newlib/libc/string/bcmp.c
@@ -32,8 +32,7 @@ QUICKREF
 #include <strings.h>
 
 int
-_DEFUN (bcmp, (m1, m2, n),
-	const void *m1,
+bcmp (const void *m1,
 	const void *m2,
 	size_t n)
 
diff --git a/newlib/libc/string/bcopy.c b/newlib/libc/string/bcopy.c
index d6cb0c9..d8bdeb5 100644
--- a/newlib/libc/string/bcopy.c
+++ b/newlib/libc/string/bcopy.c
@@ -24,8 +24,7 @@ QUICKREF
 #include <strings.h>
 
 void
-_DEFUN (bcopy, (b1, b2, length),
-	const void *b1,
+bcopy (const void *b1,
 	void *b2,
 	size_t length)
 {
diff --git a/newlib/libc/string/gnu_basename.c b/newlib/libc/string/gnu_basename.c
index 90e22cc..c435425 100644
--- a/newlib/libc/string/gnu_basename.c
+++ b/newlib/libc/string/gnu_basename.c
@@ -14,8 +14,7 @@
 #include <string.h>
 
 char *
-_DEFUN (__gnu_basename, (path),
-	const char *path)
+__gnu_basename (const char *path)
 {
   char *p;
   if ((p = strrchr (path, '/')))
diff --git a/newlib/libc/string/index.c b/newlib/libc/string/index.c
index 13519b4..4a67885 100644
--- a/newlib/libc/string/index.c
+++ b/newlib/libc/string/index.c
@@ -31,8 +31,7 @@ QUICKREF
 #include <strings.h>
 
 char *
-_DEFUN (index, (s, c),
-	const char *s,
+index (const char *s,
 	int c)
 {
   return strchr (s, c);
diff --git a/newlib/libc/string/memccpy.c b/newlib/libc/string/memccpy.c
index 9b94061..1f5f55c 100644
--- a/newlib/libc/string/memccpy.c
+++ b/newlib/libc/string/memccpy.c
@@ -56,8 +56,7 @@ PORTABILITY
 
 
 void *
-_DEFUN (memccpy, (dst0, src0, endchar, len0),
-	void *__restrict dst0,
+memccpy (void *__restrict dst0,
 	const void *__restrict src0,
 	int endchar0,
 	size_t len0)
diff --git a/newlib/libc/string/memchr.c b/newlib/libc/string/memchr.c
index 91f0b37..21bc4d8 100644
--- a/newlib/libc/string/memchr.c
+++ b/newlib/libc/string/memchr.c
@@ -62,8 +62,7 @@ QUICKREF
 #define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
 
 void *
-_DEFUN (memchr, (src_void, c, length),
-	const void *src_void,
+memchr (const void *src_void,
 	int c,
 	size_t length)
 {
diff --git a/newlib/libc/string/memcmp.c b/newlib/libc/string/memcmp.c
index c05cf57..342fb9f 100644
--- a/newlib/libc/string/memcmp.c
+++ b/newlib/libc/string/memcmp.c
@@ -43,8 +43,7 @@ QUICKREF
 #define TOO_SMALL(LEN)  ((LEN) < LBLOCKSIZE)
 
 int
-_DEFUN (memcmp, (m1, m2, n),
-	const void *m1,
+memcmp (const void *m1,
 	const void *m2,
 	size_t n)
 {
diff --git a/newlib/libc/string/memcpy.c b/newlib/libc/string/memcpy.c
index e1ae0ff..a1cff12 100644
--- a/newlib/libc/string/memcpy.c
+++ b/newlib/libc/string/memcpy.c
@@ -44,8 +44,7 @@ QUICKREF
 #define TOO_SMALL(LEN)  ((LEN) < BIGBLOCKSIZE)
 
 void *
-_DEFUN (memcpy, (dst0, src0, len0),
-	void *__restrict dst0,
+memcpy (void *__restrict dst0,
 	const void *__restrict src0,
 	size_t len0)
 {
diff --git a/newlib/libc/string/memmem.c b/newlib/libc/string/memmem.c
index 5588b9f..5c57eff 100644
--- a/newlib/libc/string/memmem.c
+++ b/newlib/libc/string/memmem.c
@@ -46,8 +46,7 @@ QUICKREF
 #endif
 
 void *
-_DEFUN (memmem, (haystack_start, haystack_len, needle_start, needle_len),
-	const void *haystack_start,
+memmem (const void *haystack_start,
 	size_t haystack_len,
 	const void *needle_start,
 	size_t needle_len)
diff --git a/newlib/libc/string/memmove.c b/newlib/libc/string/memmove.c
index 70adb83..da5dfdb 100644
--- a/newlib/libc/string/memmove.c
+++ b/newlib/libc/string/memmove.c
@@ -50,8 +50,7 @@ QUICKREF
 /*SUPPRESS 20*/
 void *
 __inhibit_loop_to_libcall
-_DEFUN (memmove, (dst_void, src_void, length),
-	void *dst_void,
+memmove (void *dst_void,
 	const void *src_void,
 	size_t length)
 {
diff --git a/newlib/libc/string/mempcpy.c b/newlib/libc/string/mempcpy.c
index babaea0..1291656 100644
--- a/newlib/libc/string/mempcpy.c
+++ b/newlib/libc/string/mempcpy.c
@@ -43,8 +43,7 @@ PORTABILITY
 #define TOO_SMALL(LEN)  ((LEN) < BIGBLOCKSIZE)
 
 void *
-_DEFUN (mempcpy, (dst0, src0, len0),
-	void *dst0,
+mempcpy (void *dst0,
 	const void *src0,
 	size_t len0)
 {
diff --git a/newlib/libc/string/memrchr.c b/newlib/libc/string/memrchr.c
index 432f462..652efb3 100644
--- a/newlib/libc/string/memrchr.c
+++ b/newlib/libc/string/memrchr.c
@@ -62,8 +62,7 @@ QUICKREF
 #define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
 
 void *
-_DEFUN (memrchr, (src_void, c, length),
-	const void *src_void,
+memrchr (const void *src_void,
 	int c,
 	size_t length)
 {
diff --git a/newlib/libc/string/memset.c b/newlib/libc/string/memset.c
index 5ce15c5..e8e667a 100644
--- a/newlib/libc/string/memset.c
+++ b/newlib/libc/string/memset.c
@@ -35,8 +35,7 @@ QUICKREF
 
 void *
 __inhibit_loop_to_libcall
-_DEFUN (memset, (m, c, n),
-	void *m,
+memset (void *m,
 	int c,
 	size_t n)
 {
diff --git a/newlib/libc/string/rawmemchr.c b/newlib/libc/string/rawmemchr.c
index 881bd23..56e2b5e 100644
--- a/newlib/libc/string/rawmemchr.c
+++ b/newlib/libc/string/rawmemchr.c
@@ -61,8 +61,7 @@ QUICKREF
 #define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
 
 void *
-_DEFUN (rawmemchr, (src_void, c),
-	const void *src_void,
+rawmemchr (const void *src_void,
 	int c)
 {
   const unsigned char *src = (const unsigned char *) src_void;
diff --git a/newlib/libc/string/rindex.c b/newlib/libc/string/rindex.c
index 0c7f153..39e5aa2 100644
--- a/newlib/libc/string/rindex.c
+++ b/newlib/libc/string/rindex.c
@@ -31,8 +31,7 @@ QUICKREF
 #include <strings.h>
 
 char *
-_DEFUN (rindex, (s, c),
-	const char *s,
+rindex (const char *s,
 	int c)
 {
   return strrchr (s, c);
diff --git a/newlib/libc/string/stpcpy.c b/newlib/libc/string/stpcpy.c
index 3933036..4e2ae9f 100644
--- a/newlib/libc/string/stpcpy.c
+++ b/newlib/libc/string/stpcpy.c
@@ -53,8 +53,7 @@ QUICKREF
 #endif
 
 char*
-_DEFUN (stpcpy, (dst, src),
-	char *__restrict dst,
+stpcpy (char *__restrict dst,
 	const char *__restrict src)
 {
 #if !defined(PREFER_SIZE_OVER_SPEED) && !defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/stpncpy.c b/newlib/libc/string/stpncpy.c
index 69fa851..87fe268 100644
--- a/newlib/libc/string/stpncpy.c
+++ b/newlib/libc/string/stpncpy.c
@@ -61,8 +61,7 @@ QUICKREF
 #define TOO_SMALL(LEN) ((LEN) < sizeof (long))
 
 char *
-_DEFUN (stpncpy, (dst, src),
-	char *__restrict dst,
+stpncpy (char *__restrict dst,
 	const char *__restrict src,
 	size_t count)
 {
diff --git a/newlib/libc/string/strcasecmp.c b/newlib/libc/string/strcasecmp.c
index 4a48aa6..c75a3e2 100644
--- a/newlib/libc/string/strcasecmp.c
+++ b/newlib/libc/string/strcasecmp.c
@@ -36,8 +36,7 @@ QUICKREF
 #include <ctype.h>
 
 int
-_DEFUN (strcasecmp, (s1, s2),
-	const char *s1,
+strcasecmp (const char *s1,
 	const char *s2)
 {
   int d = 0;
diff --git a/newlib/libc/string/strcasestr.c b/newlib/libc/string/strcasestr.c
index 1cc5f6e..36e1839 100644
--- a/newlib/libc/string/strcasestr.c
+++ b/newlib/libc/string/strcasestr.c
@@ -90,8 +90,7 @@ QUICKREF
  * Find the first occurrence of find in s, ignore case.
  */
 char *
-_DEFUN (strcasestr, (s, find),
-	const char *s,
+strcasestr (const char *s,
 	const char *find)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcat.c b/newlib/libc/string/strcat.c
index ac9bb8e..92313c4 100644
--- a/newlib/libc/string/strcat.c
+++ b/newlib/libc/string/strcat.c
@@ -54,8 +54,7 @@ QUICKREF
 /*SUPPRESS 530*/
 
 char *
-_DEFUN (strcat, (s1, s2),
-	char *__restrict s1,
+strcat (char *__restrict s1,
 	const char *__restrict s2)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strchr.c b/newlib/libc/string/strchr.c
index 05503d1..96f30be 100644
--- a/newlib/libc/string/strchr.c
+++ b/newlib/libc/string/strchr.c
@@ -52,8 +52,7 @@ QUICKREF
 #define DETECTCHAR(X,MASK) (DETECTNULL(X ^ MASK))
 
 char *
-_DEFUN (strchr, (s1, i),
-	const char *s1,
+strchr (const char *s1,
 	int i)
 {
   const unsigned char *s = (const unsigned char *)s1;
diff --git a/newlib/libc/string/strchrnul.c b/newlib/libc/string/strchrnul.c
index 14fd4e2..f5c3eb2 100644
--- a/newlib/libc/string/strchrnul.c
+++ b/newlib/libc/string/strchrnul.c
@@ -31,8 +31,7 @@ QUICKREF
 #include <string.h>
 
 char *
-_DEFUN (strchrnul, (s1, i),
-	const char *s1,
+strchrnul (const char *s1,
 	int i)
 {
   char *s = strchr(s1, i);
diff --git a/newlib/libc/string/strcmp.c b/newlib/libc/string/strcmp.c
index 6c1a038..894424a 100644
--- a/newlib/libc/string/strcmp.c
+++ b/newlib/libc/string/strcmp.c
@@ -52,8 +52,7 @@ QUICKREF
 #endif
 
 int
-_DEFUN (strcmp, (s1, s2),
-	const char *s1,
+strcmp (const char *s1,
 	const char *s2)
 { 
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcoll.c b/newlib/libc/string/strcoll.c
index fae999a..7fa8d13 100644
--- a/newlib/libc/string/strcoll.c
+++ b/newlib/libc/string/strcoll.c
@@ -36,8 +36,7 @@ QUICKREF
 #include <string.h>
 
 int
-_DEFUN (strcoll, (a, b),
-	const char *a,
+strcoll (const char *a,
 	const char *b)
 
 {
diff --git a/newlib/libc/string/strcpy.c b/newlib/libc/string/strcpy.c
index 3505b80..94e16b5 100644
--- a/newlib/libc/string/strcpy.c
+++ b/newlib/libc/string/strcpy.c
@@ -52,8 +52,7 @@ QUICKREF
 #endif
 
 char*
-_DEFUN (strcpy, (dst0, src0),
-	char *dst0,
+strcpy (char *dst0,
 	const char *src0)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strcspn.c b/newlib/libc/string/strcspn.c
index 589054b..abaa93a 100644
--- a/newlib/libc/string/strcspn.c
+++ b/newlib/libc/string/strcspn.c
@@ -26,8 +26,7 @@ PORTABILITY
 #include <string.h>
 
 size_t
-_DEFUN (strcspn, (s1, s2),
-	const char *s1,
+strcspn (const char *s1,
 	const char *s2)
 {
   const char *s = s1;
diff --git a/newlib/libc/string/strdup.c b/newlib/libc/string/strdup.c
index 6ea2dd5..3f2a026 100644
--- a/newlib/libc/string/strdup.c
+++ b/newlib/libc/string/strdup.c
@@ -5,7 +5,7 @@
 #include <string.h>
 
 char *
-_DEFUN (strdup, (str), const char *str)
+strdup (const char *str)
 {
   return _strdup_r (_REENT, str);
 }
diff --git a/newlib/libc/string/strdup_r.c b/newlib/libc/string/strdup_r.c
index 9cdee80..14c80f7 100644
--- a/newlib/libc/string/strdup_r.c
+++ b/newlib/libc/string/strdup_r.c
@@ -3,8 +3,7 @@
 #include <string.h>
 
 char *
-_DEFUN (_strdup_r, (reent_ptr, str), 
-        struct _reent *reent_ptr,
+_strdup_r (struct _reent *reent_ptr,
         const char   *str)
 {
   size_t len = strlen (str) + 1;
diff --git a/newlib/libc/string/strerror.c b/newlib/libc/string/strerror.c
index 8d5c188..c1b9346 100644
--- a/newlib/libc/string/strerror.c
+++ b/newlib/libc/string/strerror.c
@@ -385,8 +385,7 @@ QUICKREF
 #include <string.h>
 
 char *
-_DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
-	struct _reent *ptr,
+_strerror_r (struct _reent *ptr,
 	int errnum,
 	int internal,
 	int *errptr)
@@ -893,8 +892,7 @@ _DEFUN (_strerror_r, (ptr, errnum, internal, errptr),
 }
 
 char *
-_DEFUN(strerror, (int),
-       int errnum)
+strerror (int errnum)
 {
   return _strerror_r (_REENT, errnum, 0, NULL);
 }
diff --git a/newlib/libc/string/strerror_r.c b/newlib/libc/string/strerror_r.c
index c888f9f..660fee8 100644
--- a/newlib/libc/string/strerror_r.c
+++ b/newlib/libc/string/strerror_r.c
@@ -65,8 +65,7 @@ a non-empty alternate string without assigning into its third argument.
 /* For backwards-compatible linking, this must be the GNU signature;
    see xpg_strerror_r.c for the POSIX version.  */
 char *
-_DEFUN (strerror_r, (errnum, buffer, n),
-	int errnum,
+strerror_r (int errnum,
 	char *buffer,
 	size_t n)
 {
diff --git a/newlib/libc/string/strlcat.c b/newlib/libc/string/strlcat.c
index 2f99294..a91c297 100644
--- a/newlib/libc/string/strlcat.c
+++ b/newlib/libc/string/strlcat.c
@@ -42,8 +42,7 @@ static char *rcsid = "$OpenBSD: strlcat.c,v 1.8 2001/05/13 15:40:15 deraadt Exp
  * If retval >= siz, truncation occurred.
  */
 size_t
-_DEFUN (strlcat, (dst, src, siz),
-	char *dst,
+strlcat (char *dst,
 	const char *src,
 	size_t siz)
 {
diff --git a/newlib/libc/string/strlcpy.c b/newlib/libc/string/strlcpy.c
index 2dffed5..63ba31c 100644
--- a/newlib/libc/string/strlcpy.c
+++ b/newlib/libc/string/strlcpy.c
@@ -40,8 +40,7 @@ static char *rcsid = "$OpenBSD: strlcpy.c,v 1.5 2001/05/13 15:40:16 deraadt Exp
  * Returns strlen(src); if retval >= siz, truncation occurred.
  */
 size_t
-_DEFUN (strlcpy, (dst, src, siz),
-	char *dst,
+strlcpy (char *dst,
 	const char *src,
 	size_t siz)
 {
diff --git a/newlib/libc/string/strlen.c b/newlib/libc/string/strlen.c
index df76d5f..acffa49 100644
--- a/newlib/libc/string/strlen.c
+++ b/newlib/libc/string/strlen.c
@@ -49,8 +49,7 @@ QUICKREF
 #endif
 
 size_t
-_DEFUN (strlen, (str),
-	const char *str)
+strlen (const char *str)
 {
   const char *start = str;
 
diff --git a/newlib/libc/string/strlwr.c b/newlib/libc/string/strlwr.c
index c47ff48..7211c59 100644
--- a/newlib/libc/string/strlwr.c
+++ b/newlib/libc/string/strlwr.c
@@ -29,8 +29,7 @@ QUICKREF
 #include <ctype.h>
 
 char *
-_DEFUN (strlwr, (s),
-	char *s)
+strlwr (char *s)
 {
   unsigned char *ucs = (unsigned char *) s;
   for ( ; *ucs != '\0'; ucs++)
diff --git a/newlib/libc/string/strncasecmp.c b/newlib/libc/string/strncasecmp.c
index 2a6f626..09dd98b 100644
--- a/newlib/libc/string/strncasecmp.c
+++ b/newlib/libc/string/strncasecmp.c
@@ -37,8 +37,7 @@ QUICKREF
 #include <ctype.h>
 
 int 
-_DEFUN (strncasecmp, (s1, s2, n),
-	const char *s1,
+strncasecmp (const char *s1,
 	const char *s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/strncat.c b/newlib/libc/string/strncat.c
index 2411cf1..7351913 100644
--- a/newlib/libc/string/strncat.c
+++ b/newlib/libc/string/strncat.c
@@ -58,8 +58,7 @@ QUICKREF
 #endif
 
 char *
-_DEFUN (strncat, (s1, s2, n),
-	char *__restrict s1,
+strncat (char *__restrict s1,
 	const char *__restrict s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/strncmp.c b/newlib/libc/string/strncmp.c
index 685d192..16f8a77 100644
--- a/newlib/libc/string/strncmp.c
+++ b/newlib/libc/string/strncmp.c
@@ -52,8 +52,7 @@ QUICKREF
 #endif
 
 int 
-_DEFUN (strncmp, (s1, s2, n),
-	const char *s1,
+strncmp (const char *s1,
 	const char *s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/strncpy.c b/newlib/libc/string/strncpy.c
index abbe43b..e7eb34d 100644
--- a/newlib/libc/string/strncpy.c
+++ b/newlib/libc/string/strncpy.c
@@ -59,8 +59,7 @@ QUICKREF
 #define TOO_SMALL(LEN) ((LEN) < sizeof (long))
 
 char *
-_DEFUN (strncpy, (dst0, src0),
-	char *__restrict dst0,
+strncpy (char *__restrict dst0,
 	const char *__restrict src0,
 	size_t count)
 {
diff --git a/newlib/libc/string/strndup.c b/newlib/libc/string/strndup.c
index c241ca5..3ac890a 100644
--- a/newlib/libc/string/strndup.c
+++ b/newlib/libc/string/strndup.c
@@ -6,8 +6,7 @@
 #include <string.h>
 
 char *
-_DEFUN (strndup, (str, n), 
-	const char *str,
+strndup (const char *str,
 	size_t n)
 {
   return _strndup_r (_REENT, str, n);
diff --git a/newlib/libc/string/strndup_r.c b/newlib/libc/string/strndup_r.c
index 3c7e8ee..1b6cf84 100644
--- a/newlib/libc/string/strndup_r.c
+++ b/newlib/libc/string/strndup_r.c
@@ -3,8 +3,7 @@
 #include <string.h>
 
 char *
-_DEFUN (_strndup_r, (reent_ptr, str, n), 
-        struct _reent *reent_ptr,
+_strndup_r (struct _reent *reent_ptr,
         const char   *str,
         size_t n)
 {
diff --git a/newlib/libc/string/strnlen.c b/newlib/libc/string/strnlen.c
index 42f460f..3ee18d1 100644
--- a/newlib/libc/string/strnlen.c
+++ b/newlib/libc/string/strnlen.c
@@ -30,8 +30,7 @@ PORTABILITY
 #include <string.h>
 
 size_t
-_DEFUN (strnlen, (str, n),
-	const char *str,
+strnlen (const char *str,
 	size_t n)
 {
   const char *start = str;
diff --git a/newlib/libc/string/strpbrk.c b/newlib/libc/string/strpbrk.c
index f70efc1..774db1e 100644
--- a/newlib/libc/string/strpbrk.c
+++ b/newlib/libc/string/strpbrk.c
@@ -25,8 +25,7 @@ PORTABILITY
 #include <string.h>
 
 char *
-_DEFUN (strpbrk, (s1, s2),
-	const char *s1,
+strpbrk (const char *s1,
 	const char *s2)
 {
   const char *c = s2;
diff --git a/newlib/libc/string/strrchr.c b/newlib/libc/string/strrchr.c
index 4aafd50..04897e1 100644
--- a/newlib/libc/string/strrchr.c
+++ b/newlib/libc/string/strrchr.c
@@ -30,8 +30,7 @@ QUICKREF
 #include <string.h>
 
 char *
-_DEFUN (strrchr, (s, i),
-	const char *s,
+strrchr (const char *s,
 	int i)
 {
   const char *last = NULL;
diff --git a/newlib/libc/string/strsep.c b/newlib/libc/string/strsep.c
index e597827..e1262ac 100644
--- a/newlib/libc/string/strsep.c
+++ b/newlib/libc/string/strsep.c
@@ -11,8 +11,7 @@
 extern char *__strtok_r (char *, const char *, char **, int);
 
 char *
-_DEFUN (strsep, (source_ptr, delim),
-	register char **source_ptr,
+strsep (register char **source_ptr,
 	register const char *delim)
 {
 	return __strtok_r (*source_ptr, delim, source_ptr, 0);
diff --git a/newlib/libc/string/strsignal.c b/newlib/libc/string/strsignal.c
index 86a0e5d..544857b 100644
--- a/newlib/libc/string/strsignal.c
+++ b/newlib/libc/string/strsignal.c
@@ -53,8 +53,7 @@ QUICKREF
 #include <reent.h>
 
 char *
-_DEFUN (strsignal, (signal),
-	int signal)
+strsignal (int signal)
 {
   char *buffer;
   struct _reent *ptr;
diff --git a/newlib/libc/string/strspn.c b/newlib/libc/string/strspn.c
index 22ccd0b..baf2399 100644
--- a/newlib/libc/string/strspn.c
+++ b/newlib/libc/string/strspn.c
@@ -30,8 +30,7 @@ QUICKREF
 #include <string.h>
 
 size_t
-_DEFUN (strspn, (s1, s2),
-	const char *s1,
+strspn (const char *s1,
 	const char *s2)
 {
   const char *s = s1;
diff --git a/newlib/libc/string/strstr.c b/newlib/libc/string/strstr.c
index 749edbc..580ad62 100644
--- a/newlib/libc/string/strstr.c
+++ b/newlib/libc/string/strstr.c
@@ -39,8 +39,7 @@ QUICKREF
 #endif
 
 char *
-_DEFUN (strstr, (searchee, lookfor),
-	const char *searchee,
+strstr (const char *searchee,
 	const char *lookfor)
 {
 #if defined(PREFER_SIZE_OVER_SPEED) || defined(__OPTIMIZE_SIZE__)
diff --git a/newlib/libc/string/strtok.c b/newlib/libc/string/strtok.c
index 92c8017..801f51a 100644
--- a/newlib/libc/string/strtok.c
+++ b/newlib/libc/string/strtok.c
@@ -79,8 +79,7 @@ QUICKREF
 extern char *__strtok_r (char *, const char *, char **, int);
 
 char *
-_DEFUN (strtok, (s, delim),
-	register char *__restrict s,
+strtok (register char *__restrict s,
 	register const char *__restrict delim)
 {
 	struct _reent *reent = _REENT;
diff --git a/newlib/libc/string/strtok_r.c b/newlib/libc/string/strtok_r.c
index 0d01dca..d17fd69 100644
--- a/newlib/libc/string/strtok_r.c
+++ b/newlib/libc/string/strtok_r.c
@@ -30,8 +30,7 @@
 #include <string.h>
 
 char *
-_DEFUN (__strtok_r, (s, delim, lasts, skip_leading_delim),
-	register char *s,
+__strtok_r (register char *s,
 	register const char *delim,
 	char **lasts,
 	int skip_leading_delim)
@@ -90,8 +89,7 @@ cont:
 }
 
 char *
-_DEFUN (strtok_r, (s, delim, lasts),
-	register char *__restrict s,
+strtok_r (register char *__restrict s,
 	register const char *__restrict delim,
 	char **__restrict lasts)
 {
diff --git a/newlib/libc/string/strupr.c b/newlib/libc/string/strupr.c
index dbec79e..a175d5c 100644
--- a/newlib/libc/string/strupr.c
+++ b/newlib/libc/string/strupr.c
@@ -29,8 +29,7 @@ QUICKREF
 #include <ctype.h>
 
 char *
-_DEFUN (strupr, (s),
-	char *s)
+strupr (char *s)
 {
   unsigned char *ucs = (unsigned char *) s;
   for ( ; *ucs != '\0'; ucs++)
diff --git a/newlib/libc/string/strxfrm.c b/newlib/libc/string/strxfrm.c
index 13c51be..c5df0bc 100644
--- a/newlib/libc/string/strxfrm.c
+++ b/newlib/libc/string/strxfrm.c
@@ -46,8 +46,7 @@ QUICKREF
 #include <string.h>
 
 size_t
-_DEFUN (strxfrm, (s1, s2, n),
-	char *__restrict s1,
+strxfrm (char *__restrict s1,
 	const char *__restrict s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/swab.c b/newlib/libc/string/swab.c
index 1c14a4c..28ab978 100644
--- a/newlib/libc/string/swab.c
+++ b/newlib/libc/string/swab.c
@@ -18,8 +18,7 @@ PORTABILITY
 #include <unistd.h>
 
 void
-_DEFUN (swab, (b1, b2, length),
-	const void *b1,
+swab (const void *b1,
 	void *b2,
 	ssize_t length)
 {
diff --git a/newlib/libc/string/u_strerr.c b/newlib/libc/string/u_strerr.c
index 174d917..cde05ad 100644
--- a/newlib/libc/string/u_strerr.c
+++ b/newlib/libc/string/u_strerr.c
@@ -1,8 +1,7 @@
 #include <_ansi.h>
 
 char *
-_DEFUN(_user_strerror, (errnum, internal, errptr),
-       int errnum,
+_user_strerror (int errnum,
        int internal,
        int *errptr)
 {
diff --git a/newlib/libc/string/wcpcpy.c b/newlib/libc/string/wcpcpy.c
index 942fad1..76c5311 100644
--- a/newlib/libc/string/wcpcpy.c
+++ b/newlib/libc/string/wcpcpy.c
@@ -26,8 +26,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcpcpy, (s1, s2),
-	wchar_t *__restrict s1,
+wcpcpy (wchar_t *__restrict s1,
 	const wchar_t *__restrict s2)
 {
   while ((*s1++ = *s2++))
diff --git a/newlib/libc/string/wcpncpy.c b/newlib/libc/string/wcpncpy.c
index 11f4d7c..d4e8bcf 100644
--- a/newlib/libc/string/wcpncpy.c
+++ b/newlib/libc/string/wcpncpy.c
@@ -33,8 +33,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcpncpy, (dst, src, count),
-	wchar_t *__restrict dst,
+wcpncpy (wchar_t *__restrict dst,
 	const wchar_t *__restrict src,
 	size_t count)
 {
diff --git a/newlib/libc/string/wcscasecmp.c b/newlib/libc/string/wcscasecmp.c
index 4837549..b8623ba 100644
--- a/newlib/libc/string/wcscasecmp.c
+++ b/newlib/libc/string/wcscasecmp.c
@@ -36,8 +36,7 @@ QUICKREF
 #include <wctype.h>
 
 int
-_DEFUN (wcscasecmp, (s1, s2),
-	const wchar_t *s1,
+wcscasecmp (const wchar_t *s1,
 	const wchar_t *s2)
 {
   int d = 0;
diff --git a/newlib/libc/string/wcscat.c b/newlib/libc/string/wcscat.c
index 40b7774..c6bde4a 100644
--- a/newlib/libc/string/wcscat.c
+++ b/newlib/libc/string/wcscat.c
@@ -61,8 +61,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcscat, (s1, s2),
-	wchar_t *__restrict s1,
+wcscat (wchar_t *__restrict s1,
 	const wchar_t *__restrict s2)
 {
   wchar_t *p;
diff --git a/newlib/libc/string/wcschr.c b/newlib/libc/string/wcschr.c
index f883f54..62b96c3 100644
--- a/newlib/libc/string/wcschr.c
+++ b/newlib/libc/string/wcschr.c
@@ -58,8 +58,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcschr, (s, c),
-	const wchar_t * s,
+wcschr (const wchar_t * s,
 	wchar_t c)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcscmp.c b/newlib/libc/string/wcscmp.c
index 1fb3575..2784fac 100644
--- a/newlib/libc/string/wcscmp.c
+++ b/newlib/libc/string/wcscmp.c
@@ -67,8 +67,7 @@ No supporting OS subroutines are required.
  * Compare strings.
  */
 int
-_DEFUN (wcscmp, (s1, s2),
-	const wchar_t * s1,
+wcscmp (const wchar_t * s1,
 	const wchar_t * s2)
 {
 
diff --git a/newlib/libc/string/wcscoll.c b/newlib/libc/string/wcscoll.c
index 7d6b927..4bbf39c 100644
--- a/newlib/libc/string/wcscoll.c
+++ b/newlib/libc/string/wcscoll.c
@@ -33,8 +33,7 @@ PORTABILITY
 #include <wchar.h>
 
 int
-_DEFUN (wcscoll, (a, b),
-	const wchar_t *a,
+wcscoll (const wchar_t *a,
 	const wchar_t *b)
 
 {
diff --git a/newlib/libc/string/wcscpy.c b/newlib/libc/string/wcscpy.c
index 679e9c5..802d2af 100644
--- a/newlib/libc/string/wcscpy.c
+++ b/newlib/libc/string/wcscpy.c
@@ -57,8 +57,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcscpy, (s1, s2),
-	wchar_t *__restrict s1,
+wcscpy (wchar_t *__restrict s1,
 	const wchar_t *__restrict s2)
 {
   wchar_t *p;
diff --git a/newlib/libc/string/wcscspn.c b/newlib/libc/string/wcscspn.c
index 54bca2f..4feb6e7 100644
--- a/newlib/libc/string/wcscspn.c
+++ b/newlib/libc/string/wcscspn.c
@@ -56,8 +56,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 size_t
-_DEFUN (wcscspn, (s, set),
-	const wchar_t * s,
+wcscspn (const wchar_t * s,
 	const wchar_t * set)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcslcat.c b/newlib/libc/string/wcslcat.c
index dd96d30..189a710 100644
--- a/newlib/libc/string/wcslcat.c
+++ b/newlib/libc/string/wcslcat.c
@@ -68,8 +68,7 @@ No supporting OS subroutines are required.
  * truncation occurred.
  */
 size_t
-_DEFUN (wcslcat, (dst, src, siz),
-	wchar_t * dst,
+wcslcat (wchar_t * dst,
 	const wchar_t * src,
 	size_t siz)
 {
diff --git a/newlib/libc/string/wcslcpy.c b/newlib/libc/string/wcslcpy.c
index a21f8c8..3d688a9 100644
--- a/newlib/libc/string/wcslcpy.c
+++ b/newlib/libc/string/wcslcpy.c
@@ -62,8 +62,7 @@ No supporting OS subroutines are required.
  * Returns wcslen(src); if retval >= siz, truncation occurred.
  */
 size_t
-_DEFUN (wcslcpy, (dst, src, siz),
-	wchar_t * dst,
+wcslcpy (wchar_t * dst,
 	const wchar_t * src,
 	size_t siz)
 {
diff --git a/newlib/libc/string/wcslen.c b/newlib/libc/string/wcslen.c
index c927577..8fa9f72 100644
--- a/newlib/libc/string/wcslen.c
+++ b/newlib/libc/string/wcslen.c
@@ -55,8 +55,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 size_t
-_DEFUN (wcslen, (s),
-	const wchar_t * s)
+wcslen (const wchar_t * s)
 {
   const wchar_t *p;
 
diff --git a/newlib/libc/string/wcsncasecmp.c b/newlib/libc/string/wcsncasecmp.c
index 7abb154..b77952a 100644
--- a/newlib/libc/string/wcsncasecmp.c
+++ b/newlib/libc/string/wcsncasecmp.c
@@ -37,8 +37,7 @@ QUICKREF
 #include <wctype.h>
 
 int 
-_DEFUN (wcsncasecmp, (s1, s2, n),
-	const wchar_t *s1,
+wcsncasecmp (const wchar_t *s1,
 	const wchar_t *s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/wcsncat.c b/newlib/libc/string/wcsncat.c
index 3c344b4..4c14e19 100644
--- a/newlib/libc/string/wcsncat.c
+++ b/newlib/libc/string/wcsncat.c
@@ -62,8 +62,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcsncat, (s1, s2, n),
-	wchar_t *__restrict s1,
+wcsncat (wchar_t *__restrict s1,
 	const wchar_t *__restrict s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/wcsncmp.c b/newlib/libc/string/wcsncmp.c
index 2dc7660..aba4f54 100644
--- a/newlib/libc/string/wcsncmp.c
+++ b/newlib/libc/string/wcsncmp.c
@@ -63,8 +63,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 int
-_DEFUN (wcsncmp, (s1, s2, n),
-	const wchar_t * s1,
+wcsncmp (const wchar_t * s1,
 	const wchar_t * s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/wcsncpy.c b/newlib/libc/string/wcsncpy.c
index 324dad3..9b103b1 100644
--- a/newlib/libc/string/wcsncpy.c
+++ b/newlib/libc/string/wcsncpy.c
@@ -35,8 +35,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcsncpy, (s1, s2, n),
-	wchar_t *__restrict s1,
+wcsncpy (wchar_t *__restrict s1,
 	const wchar_t *__restrict s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/wcsnlen.c b/newlib/libc/string/wcsnlen.c
index cc7d66e..fff1a7e 100644
--- a/newlib/libc/string/wcsnlen.c
+++ b/newlib/libc/string/wcsnlen.c
@@ -52,8 +52,7 @@ PORTABILITY
 #include <wchar.h>
 
 size_t
-_DEFUN(wcsnlen, (s, maxlen), 
-                 const wchar_t *s,
+wcsnlen (const wchar_t *s,
                  size_t maxlen)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcspbrk.c b/newlib/libc/string/wcspbrk.c
index ecda7af..5a3d01e 100644
--- a/newlib/libc/string/wcspbrk.c
+++ b/newlib/libc/string/wcspbrk.c
@@ -57,8 +57,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcspbrk, (s, set),
-	const wchar_t * s,
+wcspbrk (const wchar_t * s,
 	const wchar_t * set)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcsrchr.c b/newlib/libc/string/wcsrchr.c
index f12ccc2..0e22dc0 100644
--- a/newlib/libc/string/wcsrchr.c
+++ b/newlib/libc/string/wcsrchr.c
@@ -60,8 +60,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcsrchr, (s, c),
-	const wchar_t * s,
+wcsrchr (const wchar_t * s,
 	wchar_t c)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcsspn.c b/newlib/libc/string/wcsspn.c
index 1968168..db64f1f 100644
--- a/newlib/libc/string/wcsspn.c
+++ b/newlib/libc/string/wcsspn.c
@@ -56,8 +56,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 size_t
-_DEFUN (wcsspn, (s, set),
-	const wchar_t * s,
+wcsspn (const wchar_t * s,
 	const wchar_t * set)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcsstr.c b/newlib/libc/string/wcsstr.c
index d5a0314..e77e505 100644
--- a/newlib/libc/string/wcsstr.c
+++ b/newlib/libc/string/wcsstr.c
@@ -61,8 +61,7 @@ PORTABILITY
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcsstr, (big, little),
-	const wchar_t *__restrict big,
+wcsstr (const wchar_t *__restrict big,
 	const wchar_t *__restrict little)
 {
   const wchar_t *p;
diff --git a/newlib/libc/string/wcstok.c b/newlib/libc/string/wcstok.c
index 2467704..f7d1c5e 100644
--- a/newlib/libc/string/wcstok.c
+++ b/newlib/libc/string/wcstok.c
@@ -90,8 +90,7 @@ QUICKREF
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wcstok, (s, delim, lasts),
-	register wchar_t *__restrict s,
+wcstok (register wchar_t *__restrict s,
 	register const wchar_t *__restrict delim,
 	wchar_t **__restrict lasts)
 {
diff --git a/newlib/libc/string/wcswidth.c b/newlib/libc/string/wcswidth.c
index 19abfd9..4be7b8a 100644
--- a/newlib/libc/string/wcswidth.c
+++ b/newlib/libc/string/wcswidth.c
@@ -34,8 +34,7 @@ PORTABILITY
 #include "local.h"
 
 int
-_DEFUN (wcswidth, (pwcs, n),
-	const wchar_t *pwcs,
+wcswidth (const wchar_t *pwcs,
 	size_t n)
 
 {
diff --git a/newlib/libc/string/wcsxfrm.c b/newlib/libc/string/wcsxfrm.c
index 78d7da5..72b3c5b 100644
--- a/newlib/libc/string/wcsxfrm.c
+++ b/newlib/libc/string/wcsxfrm.c
@@ -36,8 +36,7 @@ PORTABILITY
 #include <wchar.h>
 
 size_t
-_DEFUN (wcsxfrm, (a, b, n),
-	wchar_t *__restrict a,
+wcsxfrm (wchar_t *__restrict a,
 	const wchar_t *__restrict b,
 	size_t n)
 
diff --git a/newlib/libc/string/wcwidth.c b/newlib/libc/string/wcwidth.c
index a8c73a5..fc40afd 100644
--- a/newlib/libc/string/wcwidth.c
+++ b/newlib/libc/string/wcwidth.c
@@ -163,8 +163,7 @@ bisearch(wint_t ucs, const struct interval *table, int max)
  */
 
 int
-_DEFUN (__wcwidth, (ucs),
-	const wint_t ucs)
+__wcwidth (const wint_t ucs)
 {
 #ifdef _MB_CAPABLE
   /* sorted list of non-overlapping intervals of East Asian Ambiguous
@@ -329,8 +328,7 @@ _DEFUN (__wcwidth, (ucs),
 }
 
 int     
-_DEFUN (wcwidth, (wc),
-	const wchar_t wc)
+wcwidth (const wchar_t wc)
 { 
   wint_t wi = wc;
 
diff --git a/newlib/libc/string/wmemchr.c b/newlib/libc/string/wmemchr.c
index 8db2f64..0353e54 100644
--- a/newlib/libc/string/wmemchr.c
+++ b/newlib/libc/string/wmemchr.c
@@ -63,8 +63,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wmemchr, (s, c, n),
-	const wchar_t * s,
+wmemchr (const wchar_t * s,
 	wchar_t c,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmemcmp.c b/newlib/libc/string/wmemcmp.c
index abb9ed6..20223a3 100644
--- a/newlib/libc/string/wmemcmp.c
+++ b/newlib/libc/string/wmemcmp.c
@@ -62,8 +62,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 int
-_DEFUN (wmemcmp, (s1, s2, n),
-	const wchar_t * s1,
+wmemcmp (const wchar_t * s1,
 	const wchar_t * s2,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmemcpy.c b/newlib/libc/string/wmemcpy.c
index ad1aa24..d763e22 100644
--- a/newlib/libc/string/wmemcpy.c
+++ b/newlib/libc/string/wmemcpy.c
@@ -61,8 +61,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wmemcpy, (d, s, n),
-	wchar_t *__restrict d,
+wmemcpy (wchar_t *__restrict d,
 	const wchar_t *__restrict s,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmemmove.c b/newlib/libc/string/wmemmove.c
index 22b5a98..399fae4 100644
--- a/newlib/libc/string/wmemmove.c
+++ b/newlib/libc/string/wmemmove.c
@@ -66,8 +66,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wmemmove, (d, s, n),
-	wchar_t * d,
+wmemmove (wchar_t * d,
 	const wchar_t * s,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmempcpy.c b/newlib/libc/string/wmempcpy.c
index 7354e81..98983f9 100644
--- a/newlib/libc/string/wmempcpy.c
+++ b/newlib/libc/string/wmempcpy.c
@@ -34,8 +34,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t *
-_DEFUN (wmempcpy, (d, s, n),
-	wchar_t *__restrict d,
+wmempcpy (wchar_t *__restrict d,
 	const wchar_t *__restrict s,
 	size_t n)
 {
diff --git a/newlib/libc/string/wmemset.c b/newlib/libc/string/wmemset.c
index f9ec361..2120b56 100644
--- a/newlib/libc/string/wmemset.c
+++ b/newlib/libc/string/wmemset.c
@@ -59,8 +59,7 @@ No supporting OS subroutines are required.
 #include <wchar.h>
 
 wchar_t	*
-_DEFUN(wmemset, (s, c, n),
-	wchar_t *s,
+wmemset (wchar_t *s,
 	wchar_t c,
 	size_t n)
 {
diff --git a/newlib/libc/string/xpg_strerror_r.c b/newlib/libc/string/xpg_strerror_r.c
index bc18587..66e6936 100644
--- a/newlib/libc/string/xpg_strerror_r.c
+++ b/newlib/libc/string/xpg_strerror_r.c
@@ -4,8 +4,7 @@
 #include <string.h>
 
 int
-_DEFUN (__xpg_strerror_r, (errnum, buffer, n),
-	int errnum,
+__xpg_strerror_r (int errnum,
 	char *buffer,
 	size_t n)
 {