Branch merge.

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

diff --git a/src/ircd_state.c b/src/ircd_state.c
index 8e59578881e96d9d5be6a79562673cedbfa0ddaa..077646133a5abd23ef57a0e6d15ffff059bf01ea 100644 (file)
--- a/src/ircd_state.c
+++ b/src/ircd_state.c
@@ -56,7 +56,7 @@
 #include "restart.h"
 #include "s_auth.h"
 #include "s_conf.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"             /* try_connections */
 #include "s_user.h"
 #include "s_stats.h"
@@ -67,7 +67,6 @@
 #include "hook.h"
 #include "ircd_getopt.h"
 #include "newconf.h"
-#include "patricia.h"
 #include "reject.h"
 #include "s_conf.h"
 #include "s_newconf.h"
@@ -86,18 +85,6 @@ rb_dlink_list global_serv_list;    /* global servers on the network */
 rb_dlink_list local_oper_list;     /* our opers, duplicated in lclient_list */
 rb_dlink_list oper_list;           /* network opers */
 
-/* /quote set variables */
-struct SetOptions GlobalSetOptions;
-
-/* configuration set from ircd.conf */
-struct config_file_entry ConfigFileEntry;
-/* server info set from ircd.conf */
-struct server_info ServerInfo;
-/* admin info set from ircd.conf */
-struct admin_info AdminInfo;
-
-struct Counter Count;
-
 struct timeval SystemTime;
 int ServerRunning;              /* GLOBAL - server execution state */
 struct Client me;               /* That's me */