From 7f4fa1956ee087c272dd260feb6d7e1ef34d641b Mon Sep 17 00:00:00 2001
From: Jilles Tjoelker <jilles@stack.nl>
Date: Tue, 1 Apr 2008 23:11:11 +0200
Subject: [PATCH] More changes for libratbox.

---
 include/s_newconf.h | 2 +-
 modules/m_accept.c  | 4 ++--
 modules/m_gline.c   | 2 +-
 modules/m_invite.c  | 4 ++--
 modules/m_monitor.c | 6 +++---
 modules/m_resv.c    | 2 +-
 src/s_newconf.c     | 2 +-
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 66b1da4..65bbcac 100644
--- a/include/s_newconf.h
+++ b/include/s_newconf.h
@@ -54,7 +54,7 @@ extern rb_dlink_list resv_conf_list;
 extern rb_dlink_list nd_list;
 extern rb_dlink_list tgchange_list;
 
-struct _patricia_tree_t *tgchange_tree;
+struct _rb_patricia_tree_t *tgchange_tree;
 
 extern void init_s_newconf(void);
 extern void clear_s_newconf(void);
diff --git a/modules/m_accept.c b/modules/m_accept.c
index 8b86a4c..7fbf584 100644
--- a/modules/m_accept.c
+++ b/modules/m_accept.c
@@ -208,8 +208,8 @@ build_nicklist(struct Client *source_p, char *addbuf, char *delbuf, const char *
 static void
 add_accept(struct Client *source_p, struct Client *target_p)
 {
-	dlinkAddAlloc(target_p, &source_p->localClient->allow_list);
-	dlinkAddAlloc(source_p, &target_p->on_allow_list);
+	rb_dlinkAddAlloc(target_p, &source_p->localClient->allow_list);
+	rb_dlinkAddAlloc(source_p, &target_p->on_allow_list);
 }
 
 
diff --git a/modules/m_gline.c b/modules/m_gline.c
index 9908c57..ca418a8 100644
--- a/modules/m_gline.c
+++ b/modules/m_gline.c
@@ -681,7 +681,7 @@ majority_gline(struct Client *source_p, const char *user,
 	pending->last_gline_time = CurrentTime;
 	pending->time_request1 = CurrentTime;
 
-	dlinkAddAlloc(pending, &pending_glines);
+	rb_dlinkAddAlloc(pending, &pending_glines);
 
 	return NO;
 }
diff --git a/modules/m_invite.c b/modules/m_invite.c
index 799515e..35e392f 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -214,10 +214,10 @@ add_invite(struct Channel *chptr, struct Client *who)
 	}
 
 	/* add user to channel invite list */
-	dlinkAddAlloc(who, &chptr->invites);
+	rb_dlinkAddAlloc(who, &chptr->invites);
 
 	/* add channel to user invite list */
-	dlinkAddAlloc(chptr, &who->user->invited);
+	rb_dlinkAddAlloc(chptr, &who->user->invited);
 }
 
 
diff --git a/modules/m_monitor.c b/modules/m_monitor.c
index ef0f6ba..eb0dafa 100644
--- a/modules/m_monitor.c
+++ b/modules/m_monitor.c
@@ -103,11 +103,11 @@ add_monitor(struct Client *client_p, const char *nicks)
 		monptr = find_monitor(name, 1);
 
 		/* already monitoring this nick */
-		if(dlinkFind(client_p, &monptr->users))
+		if(rb_dlinkFind(client_p, &monptr->users))
 			continue;
 
-		dlinkAddAlloc(client_p, &monptr->users);
-		dlinkAddAlloc(monptr, &client_p->localClient->monitor_list);
+		rb_dlinkAddAlloc(client_p, &monptr->users);
+		rb_dlinkAddAlloc(monptr, &client_p->localClient->monitor_list);
 
 		if((target_p = find_named_person(name)) != NULL)
 		{
diff --git a/modules/m_resv.c b/modules/m_resv.c
index d1e11fc..c19d774 100644
--- a/modules/m_resv.c
+++ b/modules/m_resv.c
@@ -284,7 +284,7 @@ parse_resv(struct Client *source_p, const char *name,
 		aconf->port = 0;
 		DupString(aconf->name, name);
 		DupString(aconf->passwd, reason);
-		dlinkAddAlloc(aconf, &resv_conf_list);
+		rb_dlinkAddAlloc(aconf, &resv_conf_list);
 
 		if(temp_time > 0)
 		{
diff --git a/src/s_newconf.c b/src/s_newconf.c
index b7d87b5..3c828b2 100644
--- a/src/s_newconf.c
+++ b/src/s_newconf.c
@@ -60,7 +60,7 @@ rb_dlink_list resv_conf_list;	/* nicks only! */
 rb_dlink_list nd_list;		/* nick delay */
 rb_dlink_list tgchange_list;
 
-patricia_tree_t *tgchange_tree;
+rb_patricia_tree_t *tgchange_tree;
 
 static BlockHeap *nd_heap = NULL;