t* remove the dependence to cdefs.h

alexdingios · Dec 6, 2010 · 8b02394 · 8b02394
1 parent b983946
commit 8b02394
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 12 deletions.
diff --git a/compat/tdelete.c b/compat/tdelete.c
@@ -17,7 +17,6 @@
 # include <config.h>
 #endif
 
-#include <sys/cdefs.h>
 #include <assert.h>
 #include <stdlib.h>
 
@@ -26,7 +25,7 @@ void *
 tdelete(vkey, vrootp, compar)
 	const void *vkey;	/* key to be deleted */
 	void      **vrootp;	/* address of the root of tree */
-	int       (*compar) __P((const void *, const void *));
+	int       (*compar) (const void *, const void *);
 {
 	node_t **rootp = (node_t **)vrootp;
 	node_t *p, *q, *r;

diff --git a/compat/tdestroy.c b/compat/tdestroy.c
@@ -20,7 +20,6 @@
 // Do not implement tdestroy if that's the only missing t* function
 #ifndef HAVE_SEARCH_H
 
-#include <sys/cdefs.h>
 #include <assert.h>
 #include <stdlib.h>
 

diff --git a/compat/tfind.c b/compat/tfind.c
@@ -17,7 +17,6 @@
 # include <config.h>
 #endif
 
-#include <sys/cdefs.h>
 #include <assert.h>
 #include <stdlib.h>
 
@@ -26,7 +25,7 @@ void *
 tfind(vkey, vrootp, compar)
 	const void *vkey;		/* key to be found */
 	const void **vrootp;		/* address of the tree root */
-	int (*compar) __P((const void *, const void *));
+	int (*compar) (const void *, const void *);
 {
 	node_t * const *rootp = (node_t * const*)vrootp;
 

diff --git a/compat/tsearch.c b/compat/tsearch.c
@@ -17,7 +17,6 @@
 # include <config.h>
 #endif
 
-#include <sys/cdefs.h>
 #include <assert.h>
 #include <stdlib.h>
 
@@ -26,7 +25,7 @@ void *
 tsearch(vkey, vrootp, compar)
 	const void *vkey;		/* key to be located */
 	void **vrootp;			/* address of tree root */
-	int (*compar) __P((const void *, const void *));
+	int (*compar) (const void *, const void *);
 {
 	node_t *q;
 	node_t **rootp = (node_t **)vrootp;

diff --git a/compat/twalk.c b/compat/twalk.c
@@ -17,18 +17,17 @@
 # include <config.h>
 #endif
 
-#include <sys/cdefs.h>
 #include <assert.h>
 #include <stdlib.h>
 
-static void trecurse __P((const node_t *,
-    void  (*action)(const void *, VISIT, int), int level));
+static void trecurse (const node_t *,
+    void  (*action)(const void *, VISIT, int), int level);
 
 /* Walk the nodes of a tree */
 static void
 trecurse(root, action, level)
 	const node_t *root;	/* Root of the tree to be walked */
-	void (*action) __P((const void *, VISIT, int));
+	void (*action) (const void *, VISIT, int);
 	int level;
 {
 	assert(root != NULL);
@@ -51,7 +50,7 @@ trecurse(root, action, level)
 void
 twalk(vroot, action)
 	const void *vroot;	/* Root of the tree to be walked */
-	void (*action) __P((const void *, VISIT, int));
+	void (*action) (const void *, VISIT, int);
 {
 	if (vroot != NULL && action != NULL)
 		trecurse(vroot, action, 0);