* Removed salt.h from eggmain.h

svn: 632

src/crypt.c

@@ -8,6 +8,7 @@
 
 #include "eggmain.h"
 #include "crypt.h"
+#include "salt.h"
 #include "misc.h"
 
 #define CRYPT_BLOCKSIZE AES_BLOCK_SIZE

src/dcc.c

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

src/eggmain.h

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

src/main.c

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

src/mod/irc.mod/irc.c

@@ -9,6 +9,7 @@
 #define MAKING_IRC
 #include "src/mod/module.h"
 #include "irc.h"
+#include "src/salt.h"
 #include "src/mod/server.mod/server.h"
 #undef serv
 #include "src/mod/channels.mod/channels.h"

src/users.c

@@ -13,11 +13,9 @@
  */
 
 #include "eggmain.h"
-#ifdef HUB
-#include "misc_file.h"
-#endif
 #include "users.h"
 #include "rfc1459.h"
+#include "salt.h"
 #include "userrec.h"
 #include "misc.h"
 #include "cfg.h"
@@ -30,9 +28,11 @@
 #include "chan.h"
 #include "modules.h"
 #include "tandem.h"
-char natip[121] = "";
 #include <netinet/in.h>
 #include <arpa/inet.h>
+#ifdef HUB
+#include "misc_file.h"
+#endif /* HUB */
 
 extern struct dcc_t *dcc;
 extern struct userrec *userlist, *lastuser;
@@ -41,6 +41,7 @@ extern int dcc_total, noshare, egg_numver;
 extern char botnetnick[], tempdir[];
 extern time_t now;
 
+char natip[121] = "";
 char userfile[121] = "";	/* where the user records are stored */
 int ignore_time = 10;		/* how many minutes will ignores last? */