extern.h:

	Code format cleanup.  Move include of config.h to files that need
	it.

dnsbl.c, log.c, misc.c, opercmd.c, stats.c:
	Add include for config.h.

diff --git a/dnsbl.c b/dnsbl.c
index 95cafca1e649e113fe25b251046f3931dee4b8ba..01e795008079c3923585d99e7c731f38748989f6 100644 (file)
--- a/dnsbl.c
+++ b/dnsbl.c
@@ -41,6 +41,7 @@ along with this program; if not, write to the Free Software
 #include "opercmd.h"
 #include "scan.h"
 #include "dnsbl.h"
+#include "config.h"
 #include "extern.h"
 #include "log.h"
 

diff --git a/extern.h b/extern.h
index 214b1b9fb4125dc4873dcabaa956e80dfebcc91a..d3811348ff2af8900a560cde75d4516f93c131d2 100644 (file)
--- a/extern.h
+++ b/extern.h
@@ -1,40 +1,39 @@
 #ifndef EXTERN_H
 #define EXTERN_H
 
-    #include "config.h"
+extern int h_errno;
 
-    extern int h_errno;
+extern char *CONF_SERVER;
+extern char *CONF_PASSWORD;
+extern char *CONF_USER;
+extern char *CONF_NICK;
+extern char *CONF_OPER;
+extern char *CONF_OPER_MODES;
+extern char *CONF_REASON;
+extern char *CONF_SCANIP;
+extern char *CONF_BINDIRC;
+extern char *CONF_BINDSCAN;
+extern char *CONF_CHANNELS;
+extern char *CONF_KEYS;
+extern char *CONF_NICKSERV_IDENT;
+extern char *CONF_CHANSERV_INVITE;
+extern char *CONF_KLINE_COMMAND;
+extern char *CONF_DNSBL_ZONE;
+extern char *CONF_DNSBL_FROM;
+extern char *CONF_DNSBL_TO;
+extern char *CONF_SENDMAIL;
+extern char *CONF_HELP_EMAIL;
+extern char *CONF_AWAY;
+extern char *CONF_TARGET_STRING;
+extern string_list *CONF_EXCLUDE;
 
-    extern char *CONF_SERVER;
-    extern char *CONF_PASSWORD;
-    extern char *CONF_USER;
-    extern char *CONF_NICK;
-    extern char *CONF_OPER;
-    extern char *CONF_OPER_MODES;
-    extern char *CONF_REASON;
-    extern char *CONF_SCANIP;
-    extern char *CONF_BINDIRC;
-    extern char *CONF_BINDSCAN;
-    extern char *CONF_CHANNELS;
-    extern char *CONF_KEYS;
-    extern char *CONF_NICKSERV_IDENT;
-    extern char *CONF_CHANSERV_INVITE;
-    extern char *CONF_KLINE_COMMAND;
-    extern char *CONF_DNSBL_ZONE;
-    extern char *CONF_DNSBL_FROM;
-    extern char *CONF_DNSBL_TO;
-    extern char *CONF_SENDMAIL;
-    extern char *CONF_HELP_EMAIL;
-    extern char *CONF_AWAY;
-    extern char *CONF_TARGET_STRING;
-    extern string_list *CONF_EXCLUDE;
+extern unsigned int CONF_PORT;
+extern unsigned int CONF_SCANPORT;
+extern unsigned int CONF_FDLIMIT;
 
-    extern unsigned int CONF_PORT;
-    extern unsigned int CONF_SCANPORT;
-    extern unsigned int CONF_FDLIMIT;
-
-    extern unsigned int OPT_DEBUG;
+extern unsigned int OPT_DEBUG;
  
-    extern time_t STAT_START_TIME;
-    extern unsigned int STAT_NUM_CONNECTS;
+extern time_t STAT_START_TIME;
+extern unsigned int STAT_NUM_CONNECTS;
+
 #endif    

diff --git a/log.c b/log.c
index f9e380fedba86567e7ae55e91454d9c02e467b71..35d1d610e839912bbe124171808f44340738a546 100644 (file)
--- a/log.c
+++ b/log.c
@@ -32,6 +32,7 @@ along with this program; if not, write to the Free Software
 
 #include <time.h>
 
+#include "config.h"
 #include "extern.h"
 #include "log.h"
 

diff --git a/misc.c b/misc.c
index 730b8120e6b229680bf53f90bef19a95a92cd830..9751917507602f03f9707f880b09141df7ce962b 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -29,6 +29,7 @@ along with this program; if not, write to the Free Software
 # include <string.h>
 #endif
 
+#include "config.h"
 #include "extern.h"
 
 /* split a time_t into an English-language explanation of how

diff --git a/opercmd.c b/opercmd.c
index a8155c8aba37d3e446453be591cf0bf3199acc0e..28e24e4eb25549a3efb21499a62a0b4ac2fde018 100644 (file)
--- a/opercmd.c
+++ b/opercmd.c
@@ -36,6 +36,7 @@ along with this program; if not, write to the Free Software
 #include "misc.h"
 #include "opercmd.h"
 #include "scan.h"
+#include "config.h"
 #include "extern.h"
 
 void do_oper_cmd(const char *nick, const char *cmd, const char *param,

diff --git a/stats.c b/stats.c
index 2f0e01c2db037d76291a70e0cd4edaaa44fda778..70c596a195c9b09d2f5b0ae6520861025ff66601 100644 (file)
--- a/stats.c
+++ b/stats.c
@@ -34,6 +34,7 @@ along with this program; if not, write to the Free Software
 #include "irc.h"
 #include "misc.h"
 #include "stats.h"
+#include "config.h"
 #include "extern.h"
 #include "opercmd.h"
 #include "scan.h"