ansification: remove _DEFUN

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

9 files changed, 14 insertions, 27 deletions

diff --git a/newlib/libc/search/bsearch.c b/newlib/libc/search/bsearch.c
index 79a489680..2f1dc9d77 100644
--- a/newlib/libc/search/bsearch.c
+++ b/newlib/libc/search/bsearch.c
@@ -56,8 +56,7 @@ No supporting OS subroutines are required.
 #include <stdlib.h>
 
 void *
-_DEFUN (bsearch, (key, base, nmemb, size, compar),
-	const void *key,
+bsearch (const void *key,
 	const void *base,
 	size_t nmemb,
 	size_t size,
diff --git a/newlib/libc/search/hash.c b/newlib/libc/search/hash.c
index f20322c42..af2be9aa8 100644
--- a/newlib/libc/search/hash.c
+++ b/newlib/libc/search/hash.c
@@ -104,8 +104,7 @@ int hash_accesses, hash_collisions, hash_expansions, hash_overflows;
 /* OPEN/CLOSE */
 
 extern DB *
-_DEFUN(__hash_open, (file, flags, mode, info, dflags),
-	const char *file,
+__hash_open (const char *file,
 	int flags,
 	int mode,
 	int dflags,
diff --git a/newlib/libc/search/hcreate.c b/newlib/libc/search/hcreate.c
index 5472de1f0..7664353cc 100644
--- a/newlib/libc/search/hcreate.c
+++ b/newlib/libc/search/hcreate.c
@@ -57,7 +57,7 @@ __RCSID("$NetBSD: hcreate.c,v 1.2 2001/02/19 21:26:04 ross Exp $");
 static struct hsearch_data htab;
 
 int
-_DEFUN(hcreate, (nel), size_t nel)
+hcreate (size_t nel)
 {
   return hcreate_r (nel, &htab);
 }
@@ -69,8 +69,7 @@ hdestroy (void)
 }
 
 ENTRY *
-_DEFUN(hsearch, (item, action), 
-       ENTRY item,
+hsearch (ENTRY item,
        ACTION action)
 {
   ENTRY *retval;
diff --git a/newlib/libc/search/qsort.c b/newlib/libc/search/qsort.c
index 6c84b95b7..db3f58951 100644
--- a/newlib/libc/search/qsort.c
+++ b/newlib/libc/search/qsort.c
@@ -100,8 +100,7 @@ static inline void	 swapfunc (char *, char *, int, int);
 	es % sizeof(long) ? 2 : es == sizeof(long)? 0 : 1;
 
 static inline void
-_DEFUN(swapfunc, (a, b, n, swaptype),
-	char *a,
+swapfunc (char *a,
 	char *b,
 	int n,
 	int swaptype)
@@ -131,8 +130,7 @@ _DEFUN(swapfunc, (a, b, n, swaptype),
 #endif
 
 static inline char *
-_DEFUN(med3, (a, b, c, cmp, thunk),
-	char *a,
+med3 (char *a,
 	char *b,
 	char *c,
 	cmp_t *cmp,
@@ -149,16 +147,14 @@ __unused
 
 #if defined(I_AM_QSORT_R)
 void
-_DEFUN(__bsd_qsort_r, (a, n, es, thunk, cmp),
-	void *a,
+__bsd_qsort_r (void *a,
 	size_t n,
 	size_t es,
 	void *thunk,
 	cmp_t *cmp)
 #elif defined(I_AM_GNU_QSORT_R)
 void
-_DEFUN(qsort_r, (a, n, es, cmp, thunk),
-	void *a,
+qsort_r (void *a,
 	size_t n,
 	size_t es,
 	cmp_t *cmp,
@@ -166,8 +162,7 @@ _DEFUN(qsort_r, (a, n, es, cmp, thunk),
 #else
 #define thunk NULL
 void
-_DEFUN(qsort, (a, n, es, cmp),
-	void *a,
+qsort (void *a,
 	size_t n,
 	size_t es,
 	cmp_t *cmp)
diff --git a/newlib/libc/search/tdelete.c b/newlib/libc/search/tdelete.c
index a0128e98b..a595200db 100644
--- a/newlib/libc/search/tdelete.c
+++ b/newlib/libc/search/tdelete.c
@@ -26,8 +26,7 @@ __RCSID("$NetBSD: tdelete.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
 
 /* delete node with given key */
 void *
-_DEFUN(tdelete, (vkey, vrootp, compar),
-	const void *__restrict vkey,	/* key to be deleted */
+tdelete (const void *__restrict vkey,	/* key to be deleted */
 	void      **__restrict vrootp,	/* address of the root of tree */
 	int       (*compar)(const void *, const void *))
 {
diff --git a/newlib/libc/search/tdestroy.c b/newlib/libc/search/tdestroy.c
index e1418207a..04c6b7052 100644
--- a/newlib/libc/search/tdestroy.c
+++ b/newlib/libc/search/tdestroy.c
@@ -40,8 +40,7 @@ trecurse(root, free_action)
 }
 
 void
-_DEFUN(tdestroy, (vrootp, freefct),
-       void *vrootp,
+tdestroy (void *vrootp,
        void (*freefct)(void *))
 {
   node_t *root = (node_t *) vrootp;
diff --git a/newlib/libc/search/tfind.c b/newlib/libc/search/tfind.c
index 108213048..670f41fca 100644
--- a/newlib/libc/search/tfind.c
+++ b/newlib/libc/search/tfind.c
@@ -25,8 +25,7 @@ __RCSID("$NetBSD: tfind.c,v 1.2 1999/09/16 11:45:37 lukem Exp $");
 
 /* find a node, or return 0 */
 void *
-_DEFUN(tfind, (vkey, vrootp, compar),
-	const void *vkey,		/* key to be found */
+tfind (const void *vkey,		/* key to be found */
 	void **vrootp,		/* address of the tree root */
 	int (*compar)(const void *, const void *))
 {
diff --git a/newlib/libc/search/tsearch.c b/newlib/libc/search/tsearch.c
index 8fe265703..82d69447f 100644
--- a/newlib/libc/search/tsearch.c
+++ b/newlib/libc/search/tsearch.c
@@ -25,8 +25,7 @@ __RCSID("$NetBSD: tsearch.c,v 1.3 1999/09/16 11:45:37 lukem Exp $");
 
 /* find or insert datum into search tree */
 void *
-_DEFUN(tsearch, (vkey, vrootp, compar),
-	const void *vkey,		/* key to be located */
+tsearch (const void *vkey,		/* key to be located */
 	void **vrootp,		/* address of tree root */
 	int (*compar)(const void *, const void *))
 {
diff --git a/newlib/libc/search/twalk.c b/newlib/libc/search/twalk.c
index 26d6e97db..02ef52242 100644
--- a/newlib/libc/search/twalk.c
+++ b/newlib/libc/search/twalk.c
@@ -49,8 +49,7 @@ trecurse(root, action, level)
 
 /* Walk the nodes of a tree */
 void
-_DEFUN(twalk, (vroot, action),
-	const void *vroot,	/* Root of the tree to be walked */
+twalk (const void *vroot,	/* Root of the tree to be walked */
 	void (*action)(const void *, VISIT, int))
 {
 	if (vroot != NULL && action != NULL)