Sfoglia il codice sorgente

* Removed color.h from eggmain.h

svn: 633
Bryan Drewery 22 anni fa
parent
commit
40408dbabe
5 ha cambiato i file con 7 aggiunte e 4 eliminazioni
  1. 1 0
      src/dcc.c
  2. 1 0
      src/dccutil.c
  3. 0 1
      src/eggmain.h
  4. 4 3
      src/misc.c
  5. 1 0
      src/mod/module.h

+ 1 - 0
src/dcc.c

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

+ 1 - 0
src/dccutil.c

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

+ 0 - 1
src/eggmain.h

@@ -13,7 +13,6 @@
 #endif
 
 #include "conf.h"
-#include "color.h"
 #include "garble.h"
 
 #include "lush.h"

+ 4 - 3
src/misc.c

@@ -10,15 +10,13 @@
 #include "eggmain.h"
 #include "misc.h"
 #include "rfc1459.h"
-#ifdef HUB
-#include "userrec.h"
-#endif
 #include "misc_file.h"
 #include "users.h"
 #include "main.h"
 #include "debug.h"
 #include "dccutil.h"
 #include "chanprog.h"
+#include "color.h"
 #include "botmsg.h"
 #include "bg.h"	
 #include <sys/stat.h>
@@ -33,6 +31,9 @@
 #include <pwd.h>
 #include <errno.h>
 #include <libgen.h>
+#ifdef HUB
+#include "userrec.h"
+#endif /* HUB */
 #ifdef S_ANTITRACE
 #include <sys/ptrace.h>
 #include <sys/wait.h>

+ 1 - 0
src/mod/module.h

@@ -26,6 +26,7 @@
 
 /* Just include *all* the include files...it's slower but EASIER */
 #include "src/eggmain.h"
+#include "src/color.h"
 #include "src/users.h"
 #include "src/types.h"
 #include "src/cfg.h"