From 709d8223f5de3a9e575ea6f7416141b44dee2bba Mon Sep 17 00:00:00 2001
From: Wouter Wijngaards <wouter@nlnetlabs.nl>
Date: Thu, 19 Jan 2017 14:11:59 +0000
Subject: [PATCH] fixes for _t changes.

git-svn-id: file:///svn/unbound/trunk@3992 be551aaa-1e26-0410-a405-d3ace91eadb9
---
 compat/ctime_r.c     | 2 +-
 util/rbtree.c        | 3 ++-
 util/winsock_event.c | 2 +-
 util/winsock_event.h | 4 ++--
 winrc/win_svc.c      | 2 +-
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/compat/ctime_r.c b/compat/ctime_r.c
index 2594dc17e..87c2609a8 100644
--- a/compat/ctime_r.c
+++ b/compat/ctime_r.c
@@ -6,7 +6,7 @@
 #include "util/locks.h"
 
 /** the lock for ctime buffer */
-static lock_basic_t ctime_lock;
+static lock_basic_type ctime_lock;
 /** has it been inited */
 static int ctime_r_init = 0;
 
diff --git a/util/rbtree.c b/util/rbtree.c
index 455c115c5..f031c9a13 100644
--- a/util/rbtree.c
+++ b/util/rbtree.c
@@ -619,7 +619,8 @@ traverse_post(void (*func)(rbnode_type*, void*), void* arg, rbnode_type* node)
 }
 
 void 
-traverse_postorder(rbtree_type* tree, void (*func)(rbnode_type*, void*), void* arg)
+traverse_postorder(rbtree_type* tree, void (*func)(rbnode_type*, void*),
+	void* arg)
 {
 	traverse_post(func, arg, tree->root);
 }
diff --git a/util/winsock_event.c b/util/winsock_event.c
index 9aad27edc..63d98796d 100644
--- a/util/winsock_event.c
+++ b/util/winsock_event.c
@@ -169,7 +169,7 @@ static void handle_timeouts(struct event_base* base, struct timeval* now,
 #endif
 	verbose(VERB_CLIENT, "winsock_event handle_timeouts");
 
-        while((rbnode_t*)(p = (struct event*)rbtree_first(base->times))
+        while((rbnode_type*)(p = (struct event*)rbtree_first(base->times))
                 !=RBTREE_NULL) {
 #ifndef S_SPLINT_S
                 if(p->ev_timeout.tv_sec > now->tv_sec ||
diff --git a/util/winsock_event.h b/util/winsock_event.h
index d386a699f..d6dafac8c 100644
--- a/util/winsock_event.h
+++ b/util/winsock_event.h
@@ -132,7 +132,7 @@
 struct event_base
 {
 	/** sorted by timeout (absolute), ptr */
-	rbtree_t* times;
+	rbtree_type* times;
 	/** array (first part in use) of handles to work on */
 	struct event** items;
 	/** number of items in use in array */
@@ -169,7 +169,7 @@ struct event_base
  */
 struct event {
         /** node in timeout rbtree */
-        rbnode_t node;
+        rbnode_type node;
         /** is event already added */
         int added;
 
diff --git a/winrc/win_svc.c b/winrc/win_svc.c
index ac97ef68b..b755fb543 100644
--- a/winrc/win_svc.c
+++ b/winrc/win_svc.c
@@ -70,7 +70,7 @@ static int service_cmdline_verbose = 0;
 /** the cron callback */
 static struct comm_timer* service_cron = NULL;
 /** the cron thread */
-static ub_thread_t cron_thread = NULL;
+static ub_thread_type cron_thread = NULL;
 /** if cron has already done its quick check */
 static int cron_was_quick = 0;
 
-- 
2.47.3