* Moved exported DCC tables to dcc.h

svn: 636

src/botcmd.c

@@ -9,6 +9,7 @@
 #include "botcmd.h"
 #include "net.h"
 #include "misc.h"
+#include "dcc.h"
 #include "userrec.h"
 #include "cfg.h"
 #include "dccutil.h"

src/botmsg.c

@@ -9,6 +9,7 @@
 
 #include "eggmain.h"
 #include "misc.h"
+#include "dcc.h"
 #include "net.h"
 #include "users.h"
 #include "cfg.h"

src/cmds.c

@@ -7,6 +7,7 @@
 
 #include "eggmain.h"
 #include "cmds.h"
+#include "dcc.h"
 #include "misc.h"
 #include "net.h"
 #include "userrec.h"

src/dcc.h

@@ -2,6 +2,12 @@
 #define _DCC_H
 
 #ifndef MAKING_MODS
+
+extern struct dcc_table DCC_CHAT, DCC_BOT, DCC_LOST, DCC_BOT_NEW,
+ DCC_RELAY, DCC_RELAYING, DCC_FORK_RELAY, DCC_PRE_RELAY, DCC_CHAT_PASS,
+ DCC_FORK_BOT, DCC_SOCKET, DCC_TELNET_ID, DCC_TELNET_NEW, DCC_TELNET_PW,
+ DCC_TELNET, DCC_IDENT, DCC_IDENTWAIT, DCC_DNSWAIT;
+
 void failed_link(int);
 void dupwait_notify(char *);
 char *rand_dccresp();

src/dccutil.c

@@ -11,6 +11,7 @@
 #include <sys/stat.h>
 #include "eggmain.h"
 #include "color.h"
+#include "dcc.h"
 #include "net.h"
 #include "dccutil.h"
 #include "misc.h"

src/eggmain.h

@@ -7,11 +7,10 @@
 #ifndef _EGG_MAIN_H
 #define _EGG_MAIN_H
 
-
+/* These should be in a common.h, like it or not... */
 #ifdef HAVE_CONFIG_H
 #  include "config.h"
 #endif
-
 #include "garble.h"
 
 
@@ -40,14 +39,6 @@
 #include "chan.h"
 #include "compat/compat.h"
 
-#ifndef MAKING_MODS
-extern struct dcc_table DCC_CHAT, DCC_BOT, DCC_LOST, DCC_BOT_NEW,
- DCC_RELAY, DCC_RELAYING, DCC_FORK_RELAY, DCC_PRE_RELAY, DCC_CHAT_PASS,
- DCC_FORK_BOT, DCC_SOCKET, DCC_TELNET_ID, DCC_TELNET_NEW, DCC_TELNET_PW,
- DCC_TELNET, DCC_IDENT, DCC_IDENTWAIT, DCC_DNSWAIT;
-
-#endif
-
 
 /* This macro copies (_len - 1) bytes from _source to _target. The
  * target string is NULL-terminated.

src/main.c

@@ -8,6 +8,7 @@
 
 #include "eggmain.h"
 #include "main.h"
+#include "dcc.h"
 #include "salt.h"
 #include "misc_file.h"
 #include "net.h"

src/misc.c

@@ -11,6 +11,7 @@
 #include "misc.h"
 #include "rfc1459.h"
 #include "misc_file.h"
+#include "dcc.h"
 #include "users.h"
 #include "main.h"
 #include "debug.h"

src/userrec.c

@@ -10,6 +10,7 @@
 #include "eggmain.h"
 #include "misc_file.h"
 #include "rfc1459.h"
+#include "dcc.h"
 #include "userrec.h"
 #include "misc.h"
 #include "users.h"

src/users.c

@@ -15,6 +15,7 @@
 #include "eggmain.h"
 #include "users.h"
 #include "rfc1459.h"
+#include "dcc.h"
 #include "salt.h"
 #include "userrec.h"
 #include "misc.h"