Branch merge

[irc/rqf/shadowircd.git] / modules / m_monitor.c

diff --git a/modules/m_monitor.c b/modules/m_monitor.c
index 23e203ee4d6c419bd8309437dd955248aa67d468..e64b947927175c8dcca0b00b55c195ff60c0e536 100644 (file)
--- a/modules/m_monitor.c
+++ b/modules/m_monitor.c
@@ -31,7 +31,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "client.h"
 #include "msg.h"
 #include "parse.h"
@@ -103,11 +102,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)
                {
@@ -180,8 +179,8 @@ del_monitor(struct Client *client_p, const char *nicks)
                if((monptr = find_monitor(name, 0)) == NULL)
                        continue;
 
-               dlinkFindDestroy(client_p, &monptr->users);
-               dlinkFindDestroy(monptr, &client_p->localClient->monitor_list);
+               rb_dlinkFindDestroy(client_p, &monptr->users);
+               rb_dlinkFindDestroy(monptr, &client_p->localClient->monitor_list);
        }
 }