From ff1b857f9020ea6853016707378e7c361e3edff6 Mon Sep 17 00:00:00 2001 From: Wouter Wijngaards Date: Thu, 19 Jan 2017 11:34:21 +0000 Subject: [PATCH] compile fix git-svn-id: file:///svn/unbound/trunk@3990 be551aaa-1e26-0410-a405-d3ace91eadb9 --- libunbound/libunbound.c | 3 ++- libunbound/unbound-event.h | 3 ++- services/mesh.h | 4 ++-- util/net_help.c | 6 +++--- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c index 41be0ef3a..727b27522 100644 --- a/libunbound/libunbound.c +++ b/libunbound/libunbound.c @@ -706,7 +706,8 @@ ub_resolve(struct ub_ctx* ctx, const char* name, int rrtype, int ub_resolve_event(struct ub_ctx* ctx, const char* name, int rrtype, - int rrclass, void* mydata, ub_event_callback_type callback, int* async_id) + int rrclass, void* mydata, ub_event_callback_type callback, + int* async_id) { struct ctx_query* q; int r; diff --git a/libunbound/unbound-event.h b/libunbound/unbound-event.h index 5cf53190a..d5f0b1a36 100644 --- a/libunbound/unbound-event.h +++ b/libunbound/unbound-event.h @@ -254,7 +254,8 @@ int ub_ctx_set_event(struct ub_ctx* ctx, struct event_base* base); * @return 0 if OK, else error. */ int ub_resolve_event(struct ub_ctx* ctx, const char* name, int rrtype, - int rrclass, void* mydata, ub_event_callback_type callback, int* async_id); + int rrclass, void* mydata, ub_event_callback_type callback, + int* async_id); #ifdef __cplusplus } diff --git a/services/mesh.h b/services/mesh.h index c601a88ae..435f89c68 100644 --- a/services/mesh.h +++ b/services/mesh.h @@ -498,8 +498,8 @@ int mesh_state_add_reply(struct mesh_state* s, struct edns_data* edns, * @return: 0 on alloc error. */ int mesh_state_add_cb(struct mesh_state* s, struct edns_data* edns, - struct sldns_buffer* buf, mesh_cb_func_type cb, void* cb_arg, uint16_t qid, - uint16_t qflags); + struct sldns_buffer* buf, mesh_cb_func_type cb, void* cb_arg, + uint16_t qid, uint16_t qflags); /** * Run the mesh. Run all runnable mesh states. Which can create new diff --git a/util/net_help.c b/util/net_help.c index 248598918..6c0d68e31 100644 --- a/util/net_help.c +++ b/util/net_help.c @@ -785,7 +785,7 @@ void* outgoing_ssl_fd(void* sslctx, int fd) #if defined(HAVE_SSL) && defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED) && defined(CRYPTO_LOCK) && OPENSSL_VERSION_NUMBER < 0x10100000L /** global lock list for openssl locks */ -static lock_basic_t *ub_openssl_locks = NULL; +static lock_basic_type *ub_openssl_locks = NULL; /** callback that gets thread id for openssl */ static unsigned long @@ -810,8 +810,8 @@ int ub_openssl_lock_init(void) { #if defined(HAVE_SSL) && defined(OPENSSL_THREADS) && !defined(THREADS_DISABLED) && defined(CRYPTO_LOCK) && OPENSSL_VERSION_NUMBER < 0x10100000L int i; - ub_openssl_locks = (lock_basic_t*)reallocarray( - NULL, (size_t)CRYPTO_num_locks(), sizeof(lock_basic_t)); + ub_openssl_locks = (lock_basic_type*)reallocarray( + NULL, (size_t)CRYPTO_num_locks(), sizeof(lock_basic_type)); if(!ub_openssl_locks) return 0; for(i=0; i