More changes for libratbox.

diff --git a/include/s_newconf.h b/include/s_newconf.h
index 66b1da48baf3919ee0ade80bea12d87c5e53adc0..65bbcac72ee1cc43f58386e46f9965ee6e5442c7 100644 (file)
--- 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 8b86a4c911241bb38b8302eac49fb79290d8b7e0..7fbf584a92f5cdf62a87ab8c76f16b38289bf2a2 100644 (file)
--- 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 9908c57e243fc26abccb294f9d57c354a452bd3f..ca418a882abda842a54e498e6c1c6b8b8520fd3e 100644 (file)
--- 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 799515e201281a1bd983c2dbc08f941e91f27630..35e392ffaeabeca5bf2c542fd7f574c23e5f7e7f 100644 (file)
--- 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 ef0f6bac01b8115bba5a6450f80c95f2a431a0f9..eb0dafa9bf11a1d8127670292627dd641dc3a3c2 100644 (file)
--- 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 d1e11fccf7fa0ae5e883eb322ffb8b6ec3c6913c..c19d774e1729254d806040453daf2dbbddd05e71 100644 (file)
--- 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 b7d87b5b1c7d23f05dfd3e8cd0cf269a8bff6807..3c828b2751b0544199d793c606bbfe7117adfb53 100644 (file)
--- 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;