Move some declarations to header files, this enforces that they match.

diff --git a/include/ircd.h b/include/ircd.h
index c600f5c2a59a2362b8cbfbe102034fbad1aee070..ec8192ba94d329a92e6f8fdf47676edbbb1e6eda 100644 (file)
--- a/include/ircd.h
+++ b/include/ircd.h
@@ -99,6 +99,11 @@ extern rb_dlink_list local_oper_list;
 extern rb_dlink_list oper_list;
 extern rb_dlink_list dead_list;
 
+extern rb_bh *channel_heap;
+extern rb_bh *ban_heap;
+extern rb_bh *topic_heap;
+extern rb_bh *member_heap;
+
 extern int testing_conf;
 
 extern struct ev_entry *check_splitmode_ev;

diff --git a/include/reslib.h b/include/reslib.h
index 38e061b9f14a0aea634c39583a43b7dcd6c320d3..13360550a57decb1097f1014183ad1f8667348ae 100644 (file)
--- a/include/reslib.h
+++ b/include/reslib.h
@@ -115,4 +115,6 @@ extern void irc_ns_put16(unsigned int src, unsigned char *dst);
 extern void irc_ns_put32(unsigned long src, unsigned char *dst);
 extern int irc_res_mkquery(const char *dname, int class, int type, unsigned char *buf, int buflen);
 
+extern char irc_domain[HOSTLEN + 1];
+
 #endif

diff --git a/src/channel.c b/src/channel.c
index 5909f27521c2c797d28750951413389e4929ea57..c77e02d3a14487ea656e3af3ac3e0048ced2c172 100644 (file)
--- a/src/channel.c
+++ b/src/channel.c
@@ -41,11 +41,6 @@
 #include "s_newconf.h"
 #include "logger.h"
 
-extern rb_bh *channel_heap;
-extern rb_bh *ban_heap;
-extern rb_bh *topic_heap;
-extern rb_bh *member_heap;
-
 static int channel_capabs[] = { CAP_EX, CAP_IE,
        CAP_SERVICE,
        CAP_TS6

diff --git a/src/res.c b/src/res.c
index 81260c8b3e752eb7387ba35e4570265dfdf5536f..08b2c251cf23d484ca162e77d29574fb02fdffbd 100644 (file)
--- a/src/res.c
+++ b/src/res.c
@@ -99,9 +99,6 @@ static int proc_answer(struct reslist *request, HEADER * header, char *, char *)
 static struct reslist *find_id(int id);
 static struct DNSReply *make_dnsreply(struct reslist *request);
 
-extern char irc_domain[HOSTLEN + 1];
-
-
 /*
  * int
  * res_ourserver(inp)