From 8badb652c6a8e6de75b7bd773de478d7f09cd7a3 Mon Sep 17 00:00:00 2001 From: Love Hornquist Astrand Date: Wed, 21 Sep 2011 17:34:51 +0200 Subject: [PATCH] drop __restrict to please old compilers --- lib/roken/search.hin | 2 +- lib/roken/tsearch-test.c | 2 +- lib/roken/tsearch.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/roken/search.hin b/lib/roken/search.hin index b4edcffbb..f8592c481 100644 --- a/lib/roken/search.hin +++ b/lib/roken/search.hin @@ -32,7 +32,7 @@ typedef enum { ROKEN_CPP_START -ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL rk_tdelete(const void * __restrict, void ** __restrict, +ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL rk_tdelete(const void *, void **, int (*)(const void *, const void *)); ROKEN_LIB_FUNCTION void * ROKEN_LIB_CALL rk_tfind(const void *, void * const *, int (*)(const void *, const void *)); diff --git a/lib/roken/tsearch-test.c b/lib/roken/tsearch-test.c index cc5b9a95b..b9d99635a 100644 --- a/lib/roken/tsearch-test.c +++ b/lib/roken/tsearch-test.c @@ -19,7 +19,7 @@ struct node { int order; }; -extern void *rk_tdelete(const void * __restrict, void ** __restrict, +extern void *rk_tdelete(const void *, void **, int (*)(const void *, const void *)); extern void *rk_tfind(const void *, void * const *, int (*)(const void *, const void *)); diff --git a/lib/roken/tsearch.c b/lib/roken/tsearch.c index c51a64339..65328d367 100644 --- a/lib/roken/tsearch.c +++ b/lib/roken/tsearch.c @@ -113,7 +113,7 @@ rk_twalk(const void *vroot, * compar: function to carry out node comparisons */ ROKEN_LIB_FUNCTION void * -rk_tdelete(const void * __restrict vkey, void ** __restrict vrootp, +rk_tdelete(const void * vkey, void ** vrootp, int (*compar)(const void *, const void *)) { node_t **rootp = (node_t **)vrootp;