* Moved fixcolon() to server.h for server.mod/irc.mod

* Removed some tcl defines from eggmain.h


svn: 634

src/eggmain.h

@@ -15,53 +15,12 @@
 #include "conf.h"
 #include "garble.h"
 
-#include "lush.h"
 
-#if (((TCL_MAJOR_VERSION == 7) && (TCL_MINOR_VERSION >= 5)) || (TCL_MAJOR_VERSION > 7))
-#  define USE_TCL_EVENTS
-#  define USE_TCL_FINDEXEC
-#  define USE_TCL_PACKAGE
-#  define USE_TCL_VARARGS
-#endif
-
-#if (TCL_MAJOR_VERSION >= 8)
-#  define USE_TCL_OBJ
-#endif
-
-#if (((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 1)) || (TCL_MAJOR_VERSION > 8))
-#  define USE_TCL_BYTE_ARRAYS
-#  define USE_TCL_ENCODING
-#endif
+#include <stdarg.h>
+#define EGG_VARARGS(type, name) (type name, ...)
+#define EGG_VARARGS_DEF(type, name) (type name, ...)
+#define EGG_VARARGS_START(type, name, list) (va_start(list, name), name)
 
-#if (((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4)) || (TCL_MAJOR_VERSION > 8))
-#  ifdef CONST
-#    define EGG_CONST CONST
-#  else
-#    define EGG_CONST
-#  endif
-#else
-#  define EGG_CONST
-#endif
-
-
-/* UGH! Why couldn't Tcl pick a standard? */
-#if defined(USE_TCL_VARARGS) && (defined(__STDC__) || defined(HAS_STDARG))
-#  ifdef HAVE_STDARG_H
-#    include <stdarg.h>
-#  else
-#    ifdef HAVE_STD_ARGS_H
-#      include <std_args.h>
-#    endif
-#  endif
-#  define EGG_VARARGS(type, name) (type name, ...)
-#  define EGG_VARARGS_DEF(type, name) (type name, ...)
-#  define EGG_VARARGS_START(type, name, list) (va_start(list, name), name)
-#else
-#  include <varargs.h>
-#  define EGG_VARARGS(type, name) ()
-#  define EGG_VARARGS_DEF(type, name) (va_alist) va_dcl
-#  define EGG_VARARGS_START(type, name, list) (va_start(list), va_arg(list,type))
-#endif
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -70,7 +29,6 @@
 #  include <strings.h>
 #endif
 #include <sys/types.h>
-#include "lush.h"
 #include "lang.h"
 #include "eggdrop.h"
 #include "flags.h"
@@ -83,16 +41,6 @@
 #include "chan.h"
 #include "compat/compat.h"
 
-/* For pre Tcl7.5p1 versions */
-#ifndef HAVE_TCL_FREE
-#  define Tcl_Free(x) free(x)
-#endif
-
-/* For pre7.6 Tcl versions */
-#ifndef TCL_PATCH_LEVEL
-#  define TCL_PATCH_LEVEL Tcl_GetVar(interp, "tcl_patchLevel", TCL_GLOBAL_ONLY)
-#endif
-
 #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,
@@ -101,12 +49,6 @@ extern struct dcc_table DCC_CHAT, DCC_BOT, DCC_LOST, DCC_BOT_NEW,
 
 #endif
 
-#define fixcolon(x)		do {					\
-	if ((x)[0] == ':')			 			\
-		(x)++;							\
-	else								\
-		(x) = newsplit(&(x));					\
-} while (0)
 
 /* This macro copies (_len - 1) bytes from _source to _target. The
  * target string is NULL-terminated.
@@ -116,15 +58,5 @@ extern struct dcc_table DCC_CHAT, DCC_BOT, DCC_LOST, DCC_BOT_NEW,
 	(_target)[(_len) - 1] = 0;					\
 } while (0)
 
-#ifdef BORGCUBES
-
-/* For net.c */
-#  define O_NONBLOCK	00000004    /* POSIX non-blocking I/O		   */
-#endif				/* BORGUBES */
-
-#ifdef strncpy
-#undef strncpy
-#endif
-
 
 #endif				/* _EGG_MAIN_H */

src/mod/server.mod/server.h

@@ -10,6 +10,14 @@
 #define check_bind_ctcp(a,b,c,d,e,f) check_bind_ctcpr(a,b,c,d,e,f,BT_ctcp)
 #define check_bind_ctcr(a,b,c,d,e,f) check_bind_ctcpr(a,b,c,d,e,f,BT_ctcr)
 
+#define fixcolon(x)             do {                                    \
+        if ((x)[0] == ':')                                              \
+                (x)++;                                                  \
+        else                                                            \
+                (x) = newsplit(&(x));                                   \
+} while (0)
+
+
 #ifndef MAKING_SERVER
 /* 4 - 7 */
 #define botuserhost ((char *)(server_funcs[5]))