From ebece5658fccbc8e92289616d24b92eef619d248 Mon Sep 17 00:00:00 2001 From: David Lawrence Date: Thu, 25 May 2000 04:02:47 +0000 Subject: [PATCH] added prototypes to pointers-to-functions for sk_pop_free and lh_doall_arg to make both IRIX and HP/UX happy. --- lib/dns/sec/openssl/include/openssl/lhash.h | 2 +- lib/dns/sec/openssl/include/openssl/stack.h | 2 +- lib/dns/sec/openssl/lhash.c | 2 +- lib/dns/sec/openssl/stack.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/dns/sec/openssl/include/openssl/lhash.h b/lib/dns/sec/openssl/include/openssl/lhash.h index dd38186da6..58a9d99e6f 100644 --- a/lib/dns/sec/openssl/include/openssl/lhash.h +++ b/lib/dns/sec/openssl/include/openssl/lhash.h @@ -122,7 +122,7 @@ void *lh_insert(LHASH *lh, void *data); void *lh_delete(LHASH *lh, void *data); void *lh_retrieve(LHASH *lh, void *data); void lh_doall(LHASH *lh, void (*func)(/*void *b*/)); -void lh_doall_arg(LHASH *lh, void (*func)(/*void *a,void *b*/),void *arg); +void lh_doall_arg(LHASH *lh, void (*func)(void *a,void *b),void *arg); unsigned long lh_strhash(const char *c); #ifndef NO_FP_API diff --git a/lib/dns/sec/openssl/include/openssl/stack.h b/lib/dns/sec/openssl/include/openssl/stack.h index 80cf81c07a..9779b4557d 100644 --- a/lib/dns/sec/openssl/include/openssl/stack.h +++ b/lib/dns/sec/openssl/include/openssl/stack.h @@ -86,7 +86,7 @@ char *sk_set(STACK *, int, char *); STACK *sk_new(int (*cmp)()); void sk_free(STACK *); -void sk_pop_free(STACK *st, void (*func)()); +void sk_pop_free(STACK *st, void (*func)(char *)); int sk_insert(STACK *sk,char *data,int where); char *sk_delete(STACK *st,int loc); char *sk_delete_ptr(STACK *st, char *p); diff --git a/lib/dns/sec/openssl/lhash.c b/lib/dns/sec/openssl/lhash.c index ecdf7bdd97..49ac94c2c4 100644 --- a/lib/dns/sec/openssl/lhash.c +++ b/lib/dns/sec/openssl/lhash.c @@ -276,7 +276,7 @@ void lh_doall(LHASH *lh, void (*func)()) lh_doall_arg(lh,func,NULL); } -void lh_doall_arg(LHASH *lh, void (*func)(), void *arg) +void lh_doall_arg(LHASH *lh, void (*func)(void *a, void *b), void *arg) { int i; LHASH_NODE *a,*n; diff --git a/lib/dns/sec/openssl/stack.c b/lib/dns/sec/openssl/stack.c index 5afc0f1b63..e414f4d49c 100644 --- a/lib/dns/sec/openssl/stack.c +++ b/lib/dns/sec/openssl/stack.c @@ -265,7 +265,7 @@ void sk_zero(STACK *st) st->num=0; } -void sk_pop_free(STACK *st, void (*func)()) +void sk_pop_free(STACK *st, void (*func)(char *)) { int i;