* Moved eggmain.h to common.h

svn: 641

src/Makefile.in

@@ -64,7 +64,7 @@ makesettings: makesettings.c
 	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) makesettings.c -o makesettings
 	@$(STRIP) makesettings
 
-stringfix: stringfix.c eggmain.h ../config.h ../pack/pack.cfg eggdrop.h
+stringfix: stringfix.c common.h ../config.h ../pack/pack.cfg eggdrop.h
 	@echo -e "Compiling: \033[1mstringfix\033[0m"
 	@$(CC) $(CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/pack $(CPPFLAGS) stringfix.c -o stringfix
 	@$(STRIP) stringfix

src/auth.c

@@ -4,7 +4,7 @@
  *   auth system hooks
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "auth.h"
 #include "misc.h"
 #include "types.h"

src/bg.c

@@ -5,7 +5,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "bg.h"
 #include "main.h"
 #include <signal.h>

src/botcmd.c

@@ -5,7 +5,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "botcmd.h"
 #include "net.h"
 #include "tclhash.h"

src/botmsg.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "misc.h"
 #include "dcc.h"
 #include "net.h"

src/botmsg.h

@@ -1,7 +1,7 @@
 #ifndef _BOTMSG_H
 #define _BOTMSG_H
 
-#include "eggmain.h"
+#include "common.h"
 #include "cfg.h"
 
 /* Return codes for add_note */

src/botnet.c

@@ -9,7 +9,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "botnet.h"
 #include "net.h"
 #include "users.h"

src/cfg.c

@@ -4,7 +4,7 @@
  *   cmdpass functions
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "cfg.h"
 #include "userrec.h"
 #include "misc.h"

src/chanprog.c

@@ -9,7 +9,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "chanprog.h"
 #include "rfc1459.h"
 #include "net.h"

src/cmds.c

@@ -5,7 +5,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "cmds.h"
 #include "debug.h"
 #include "dcc.h"

src/eggmain.h → src/common.h

@@ -1,11 +1,11 @@
 /*
- * eggmain.h
+ * common.h
  *   include file to include most other include files
  *
  */
 
-#ifndef _EGG_MAIN_H
-#define _EGG_MAIN_H
+#ifndef _COMMON_H
+#define _COMMON_H
 
 /* These should be in a common.h, like it or not... */
 #ifdef HAVE_CONFIG_H
@@ -18,6 +18,9 @@
 #include "chan.h"
 #include "compat/compat.h"
 
+#ifdef HAVE_UNISTD_H
+#  include <unistd.h>
+#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -26,10 +29,6 @@
 #  include <strings.h>
 #endif
 #include "lang.h"
-#ifdef HAVE_ZLIB_H
-#  include <zlib.h>
-#endif /* HAVE_ZLIB_H */
-
 #include "tclegg.h"
 
 
@@ -42,4 +41,4 @@
 } while (0)
 
 
-#endif				/* _EGG_MAIN_H */
+#endif				/* _COMMON_H */

src/compat/inet_aton.c

@@ -3,7 +3,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "inet_aton.h"
 
 #ifndef HAVE_ISASCII

src/compat/inet_aton.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_INET_ATON_H
 #define _EGG_COMPAT_INET_ATON_H
 
-#include "src/eggmain.h"
+#include "src/common.h"
 #include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>

src/compat/inet_ntop.c

@@ -5,7 +5,7 @@
  */
 
 
-#include "eggmain.h"
+#include "common.h"
 #include "inet_ntop.h"
 
 #if defined(USE_IPV6) && !defined(HAVE_INET_NTOP)

src/compat/inet_ntop.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_INET_NTOP_H
 #define _EGG_COMPAT_INET_NTOP_H
 
-#include "src/eggmain.h"
+#include "src/common.h"
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>

src/compat/memcpy.c

@@ -3,7 +3,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "memcpy.h"
 
 #ifndef HAVE_MEMCPY

src/compat/memcpy.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_MEMCPY_H
 #define _EGG_COMPAT_MEMCPY_H
 
-#include "src/eggmain.h"
+#include "src/common.h"
 #include <string.h>
 
 #ifndef HAVE_MEMCPY

src/compat/memset.c

@@ -2,7 +2,7 @@
  * memset.c -- provides memset() if necessary.
  *
  */
-#include "eggmain.h"
+#include "common.h"
 #include "memset.h"
 
 #ifndef HAVE_MEMSET

src/compat/memset.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_MEMSET_H
 #define _EGG_COMPAT_MEMSET_H
 
-#include "src/eggmain.h"
+#include "src/common.h"
 #include <string.h>
 
 #ifndef HAVE_MEMSET

src/compat/snprintf.c

@@ -2,7 +2,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "snprintf.h"
 
 

src/compat/snprintf.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_SNPRINTF_H_
 #define _EGG_COMPAT_SNPRINTF_H_
 
-#include "src/eggmain.h"
+#include "src/common.h"
 #include <stdio.h>
 
 /* Check for broken snprintf versions */

src/compat/strcasecmp.c

@@ -3,7 +3,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "memcpy.h"
 
 #ifndef HAVE_STRCASECMP

src/compat/strcasecmp.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_STRCASECMP_H
 #define _EGG_COMPAT_STRCASECMP_H
 
-#include "src/eggmain.h"
+#include "src/common.h"
 #include <ctype.h>
 
 

src/compat/strftime.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include "src/eggmain.h"
+#include "src/common.h"
 #include "strftime.h"
 
 #ifndef HAVE_STRFTIME

src/compat/strftime.h

@@ -7,7 +7,7 @@
 #ifndef _EGG_COMPAT_STRFTIME_H_
 #define _EGG_COMPAT_STRFTIME_H_
 
-#include "src/eggmain.h"
+#include "src/common.h"
 #include <time.h>
 
 /* Use the system libraries version of strftime() if available. Otherwise

src/core_binds.c

@@ -5,7 +5,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "dccutil.h"
 #include "userrec.h"
 #include "users.h"

src/crypt.c

@@ -6,7 +6,7 @@
  */
 
 
-#include "eggmain.h"
+#include "common.h"
 #include "crypt.h"
 #include "salt.h"
 #include "misc.h"

src/dcc.c

@@ -6,7 +6,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "dcc.h"
 #include "tclhash.h"
 #include "cmds.h"

src/dccutil.c

@@ -9,7 +9,7 @@
  */
 
 #include <sys/stat.h>
-#include "eggmain.h"
+#include "common.h"
 #include "color.h"
 #include "dcc.h"
 #include "net.h"

src/dccutil.h

@@ -1,7 +1,7 @@
 #ifndef _DCCUTIL_H
 #define _DCCUTIL_H
 
-#include "eggmain.h"
+#include "common.h"
 #include "dcc.h"
 
 #ifdef HAVE_DPRINTF

src/debug.c

@@ -7,7 +7,7 @@
  */
 
 
-#include "eggmain.h"
+#include "common.h"
 #include "debug.h"
 #include "net.h"
 #include "misc.h"

src/dns.c

@@ -6,7 +6,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "dccutil.h"
 #include "net.h"
 #include "misc.h"

src/egg_timer.c

@@ -1,6 +1,6 @@
 #include <stdio.h> /* For NULL */
 #include <sys/time.h> /* For gettimeofday() */
-#include "eggmain.h"
+#include "common.h"
 
 #include "egg_timer.h"
 

src/flags.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "crypt.h"
 #include "rfc1459.h"
 #include "misc.h"

src/garble.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "garble.h"
 #include "main.h"
 

src/main.c

@@ -6,7 +6,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "main.h"
 #include "dcc.h"
 #include "salt.h"

src/makesettings.c

@@ -361,7 +361,7 @@ int loadconfig(char **argv) {
       def = newsplit(&cfg.defines);
       fprintf(f, "#define S_%s\n", def);
     }
-    fprintf(f, "\n#endif \/* _S_CONF_H *\/\n");
+    fprintf(f, "\n#endif\n");
     fflush(f);
     fclose(f);
   }
@@ -421,7 +421,7 @@ fprintf(f, " \
 #include <stdio.h> \n\
 #include <stdlib.h> \n\
 #include <string.h> \n\
-#include \"eggmain.h\"\n\
+#include \"common.h\"\n\
 #include \"debug.h\"\n\
 \n\
 char packname[512], shellhash[33], bdhash[33], dcc_prefix[2], *owners, *hubs, *owneremail;\n\n\

src/match.c

@@ -21,7 +21,7 @@
  * I hereby release this code into the public domain
  *
  */
-#include "eggmain.h"
+#include "common.h"
 #include "match.h"
 #include "rfc1459.h"
 

src/misc.c

@@ -7,7 +7,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "misc.h"
 #include "rfc1459.h"
 #include "misc_file.h"

src/misc.h

@@ -1,7 +1,7 @@
 #ifndef _MISC_H
 #define _MISC_H
 
-#include "eggmain.h"
+#include "common.h"
 
 
 /*

src/misc_file.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include <sys/stat.h>
 #include <unistd.h>
 #include <fcntl.h>

src/mod/compress.mod/compress.c

@@ -28,6 +28,7 @@
 #define MODULE_NAME "compress"
 #define MAKING_COMPRESS
 
+#include <zlib.h>
 #include <string.h>
 #include <errno.h>
 

src/mod/module.h

@@ -25,7 +25,7 @@
 #define _EGG_MOD_MODULE_H
 
 /* Just include *all* the include files...it's slower but EASIER */
-#include "src/eggmain.h"
+#include "src/common.h"
 #include "src/dcc.h"
 #include "src/debug.h"
 #include "src/color.h"

src/modules.c

@@ -6,7 +6,7 @@
  * 
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "modules.h"
 #include "tclhash.h"
 #include "misc_file.h"

src/net.c

@@ -5,7 +5,7 @@
  */
 
 #include <fcntl.h>
-#include "eggmain.h"
+#include "common.h"
 #include "net.h"
 #include "misc.h"
 #include "main.h"

src/rfc1459.c

@@ -24,7 +24,7 @@
  * --+ Dagmar
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "rfc1459.h"
 
 int _rfc_casecmp(const char *s1, const char *s2)

src/tcl.c

@@ -8,7 +8,7 @@
 
 #include <stdlib.h>		/* getenv()				*/
 #include <locale.h>		/* setlocale()				*/
-#include "eggmain.h"
+#include "common.h"
 #include "misc.h"
 #include "chanprog.h"
 #include <sys/stat.h>

src/tclhash.c

@@ -9,7 +9,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "tclhash.h"
 #include "debug.h"
 #include "chan.h"

src/userent.c

@@ -4,7 +4,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "users.h"
 #include "misc.h"
 #include "debug.h"

src/userrec.c

@@ -7,7 +7,7 @@
  */
 
 #include <sys/stat.h>
-#include "eggmain.h"
+#include "common.h"
 #include "misc_file.h"
 #include "rfc1459.h"
 #include "dcc.h"

src/users.c

@@ -12,7 +12,7 @@
  *
  */
 
-#include "eggmain.h"
+#include "common.h"
 #include "users.h"
 #include "rfc1459.h"
 #include "dcc.h"