compile fix

git-svn-id: file:///svn/unbound/trunk@3990 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/libunbound/libunbound.c b/libunbound/libunbound.c
index 41be0ef3ab205baab68a17aa8f5f9c0513c27dd8..727b275220195343492e607190472f56c806b639 100644 (file)
--- 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 5cf53190a56589bf31066b90571d2f121107b519..d5f0b1a36fe70d1eb1e919531249f7a8df547e32 100644 (file)
--- 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 c601a88ae988d4d1e8ddd02f955d16a14a519493..435f89c689d5f311b8861c962ec9a072d96d1546 100644 (file)
--- 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 248598918b8e1514ebcf08a58d8d3e4aa3fc9a07..6c0d68e312b8d2f9b447f9f44f5c8b0dc0c83589 100644 (file)
--- 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<CRYPTO_num_locks(); i++) {