Automated merge with http://85.237.34.214:8000/

[irc/rqf/shadowircd.git] / src / ircd_state.c

diff --git a/src/ircd_state.c b/src/ircd_state.c
index c1470955035e73cfc4ddacef19986e3eae906ca5..8e59578881e96d9d5be6a79562673cedbfa0ddaa 100644 (file)
--- a/src/ircd_state.c
+++ b/src/ircd_state.c
@@ -38,14 +38,11 @@
 #include "config.h"
 
 #include "client.h"
-#include "tools.h"
-#include "tools.h"
 #include "ircd.h"
 #include "channel.h"
 #include "class.h"
 #include "client.h"
 #include "common.h"
-#include "event.h"
 #include "hash.h"
 #include "irc_string.h"
 #include "ircd_signal.h"
@@ -58,7 +55,6 @@
 #include "res.h"
 #include "restart.h"
 #include "s_auth.h"
-#include "commio.h"
 #include "s_conf.h"
 #include "s_log.h"
 #include "s_serv.h"             /* try_connections */
@@ -68,10 +64,8 @@
 #include "send.h"
 #include "whowas.h"
 #include "modules.h"
-#include "memory.h"
 #include "hook.h"
 #include "ircd_getopt.h"
-#include "balloc.h"
 #include "newconf.h"
 #include "patricia.h"
 #include "reject.h"
@@ -79,7 +73,6 @@
 #include "s_newconf.h"
 #include "cache.h"
 #include "monitor.h"
-#include "libcharybdis.h"
 #include "patchlevel.h"
 #include "serno.h"
 
@@ -135,25 +128,25 @@ int opers_see_all_users = 0;
 int testing_conf = 0;
 
 struct config_channel_entry ConfigChannel;
-BlockHeap *channel_heap;
-BlockHeap *ban_heap;
-BlockHeap *topic_heap;
-BlockHeap *member_heap;
+rb_bh *channel_heap;
+rb_bh *ban_heap;
+rb_bh *topic_heap;
+rb_bh *member_heap;
 
-BlockHeap *client_heap = NULL;
-BlockHeap *lclient_heap = NULL;
-BlockHeap *pclient_heap = NULL;
+rb_bh *client_heap = NULL;
+rb_bh *lclient_heap = NULL;
+rb_bh *pclient_heap = NULL;
 
 char current_uid[IDLEN];
 
 /* patricia */
-BlockHeap *prefix_heap;
-BlockHeap *node_heap;
-BlockHeap *patricia_heap;
+rb_bh *prefix_heap;
+rb_bh *node_heap;
+rb_bh *patricia_heap;
 
-BlockHeap *linebuf_heap;
+rb_bh *linebuf_heap;
 
-BlockHeap *dnode_heap;
+rb_bh *dnode_heap;
 
 #ifdef NOTYET