[vlc-commits] commit: t* remove the dependence to cdefs.h ( =?UTF-8?Q?R=C3=A9mi=20Duraffort=20?=)
git at videolan.org
git at videolan.org
Mon Dec 6 19:12:57 CET 2010
vlc | branch: master | Rémi Duraffort <ivoire at videolan.org> | Mon Dec 6 19:12:28 2010 +0100| [8b02394e5ed092a32b6370410a1639c597b8e11a] | committer: Rémi Duraffort
t* remove the dependence to cdefs.h
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=8b02394e5ed092a32b6370410a1639c597b8e11a
---
compat/tdelete.c | 3 +--
compat/tdestroy.c | 1 -
compat/tfind.c | 3 +--
compat/tsearch.c | 3 +--
compat/twalk.c | 9 ++++-----
5 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/compat/tdelete.c b/compat/tdelete.c
index aacc63c..b1f6dbc 100644
--- 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
index ecd3171..f943c57 100644
--- 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
index 596051a..daf69fa 100644
--- 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
index 1bb24db..625e9b3 100644
--- 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
index b18c207..9ee946b 100644
--- 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);
More information about the vlc-commits
mailing list