[cvslog] (2002-07-18 19:01:56 UTC) Module eggdrop1.6: Change committed

cvslog cvs at tsss.org
Thu Jul 18 14:02:01 CST 2002


CVSROOT    : /usr/local/cvsroot
Module     : eggdrop1.6
Commit time: 2002-07-18 19:01:55 UTC
Commited by: Jeff Fisher <guppy at techmonkeys.org>

Modified files:
     doc/UPDATES1.6 src/chanprog.c src/patch.h src/tcl.c src/tcldcc.c
     src/tclmisc.c src/tcluser.c src/userent.c
     src/mod/channels.mod/channels.c src/mod/channels.mod/tclchan.c
     src/mod/irc.mod/irc.c src/mod/irc.mod/tclirc.c
     src/mod/notes.mod/notes.c src/mod/server.mod/server.c

Log message:

eggdrop works with tcl8.4b1 now

---------------------- diff included ----------------------
Index: eggdrop1.6/doc/UPDATES1.6
diff -u eggdrop1.6/doc/UPDATES1.6:1.373 eggdrop1.6/doc/UPDATES1.6:1.374
--- eggdrop1.6/doc/UPDATES1.6:1.373	Tue Jul  9 00:46:34 2002
+++ eggdrop1.6/doc/UPDATES1.6	Thu Jul 18 14:01:44 2002
@@ -1,10 +1,12 @@
-$Id: UPDATES1.6,v 1.373 2002/07/09 05:46:34 guppy Exp $
+$Id: UPDATES1.6,v 1.374 2002/07/18 19:01:44 guppy Exp $
 
 Changes in Eggdrop: (since v1.6.0)
 ----------------------------------
 
 1.6.11
 Found by  Fixed by  What...
+          guppy     some small changes to make eggdrop work with tcl8.4b1 (it won't work with
+                    tcl8.4a1 or a2 anymore though)
 dork      TaKeDa    fixed a crash while doing .kickban -nick
           Zart      the return values of uname() are now properly checked
           Zart      added handlen friendly code to various commands (this is a new patch to
Index: eggdrop1.6/src/chanprog.c
diff -u eggdrop1.6/src/chanprog.c:1.30 eggdrop1.6/src/chanprog.c:1.31
--- eggdrop1.6/src/chanprog.c:1.30	Sun Jul  7 17:35:25 2002
+++ eggdrop1.6/src/chanprog.c	Thu Jul 18 14:01:44 2002
@@ -7,7 +7,7 @@
  *   telling the current programmed settings
  *   initializing a lot of stuff and loading the tcl scripts
  *
- * $Id: chanprog.c,v 1.30 2002/07/07 22:35:25 guppy Exp $
+ * $Id: chanprog.c,v 1.31 2002/07/18 19:01:44 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -629,8 +629,12 @@
 void list_timers(Tcl_Interp *irp, tcl_timer_t *stack)
 {
   tcl_timer_t *mark;
-  char mins[10], id[16], *argv[3], *x;
-
+  char mins[10], id[16], *x;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+  const char *argv[3];
+#else
+  char *argv[3];
+#endif
   for (mark = stack; mark; mark = mark->next) {
     egg_snprintf(mins, sizeof mins, "%u", mark->mins);
     egg_snprintf(id, sizeof id, "timer%lu", mark->id);
Index: eggdrop1.6/src/mod/channels.mod/channels.c
diff -u eggdrop1.6/src/mod/channels.mod/channels.c:1.66 eggdrop1.6/src/mod/channels.mod/channels.c:1.67
--- eggdrop1.6/src/mod/channels.mod/channels.c:1.66	Fri Jun 14 00:30:31 2002
+++ eggdrop1.6/src/mod/channels.mod/channels.c	Thu Jul 18 14:01:44 2002
@@ -2,7 +2,7 @@
  * channels.c -- part of channels.mod
  *   support for channels within the bot
  *
- * $Id: channels.c,v 1.66 2002/06/14 05:30:31 wcc Exp $
+ * $Id: channels.c,v 1.67 2002/07/18 19:01:44 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -734,14 +734,23 @@
   return tot;
 }
 
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
 static char *traced_globchanset(ClientData cdata, Tcl_Interp * irp,
-				char *name1, char *name2, int flags)
+				char *name1, CONST char *name2, int flags)
+#else
+static char *traced_globchanset(ClientData cdata, Tcl_Interp * irp, 
+                                char *name1, char *name2, int flags)
+#endif
 {
   char *s;
   char *t;
   int i;
   int items;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+  CONST char **item;
+#else
   char **item;
+#endif
 
   if (flags & (TCL_TRACE_READS | TCL_TRACE_UNSETS)) {
     Tcl_SetVar2(interp, name1, name2, glob_chanset, TCL_GLOBAL_ONLY);
Index: eggdrop1.6/src/mod/channels.mod/tclchan.c
diff -u eggdrop1.6/src/mod/channels.mod/tclchan.c:1.60 eggdrop1.6/src/mod/channels.mod/tclchan.c:1.61
--- eggdrop1.6/src/mod/channels.mod/tclchan.c:1.60	Thu Jun 13 15:43:08 2002
+++ eggdrop1.6/src/mod/channels.mod/tclchan.c	Thu Jul 18 14:01:44 2002
@@ -1,7 +1,7 @@
 /*
  * tclchan.c -- part of channels.mod
  *
- * $Id: tclchan.c,v 1.60 2002/06/13 20:43:08 wcc Exp $
+ * $Id: tclchan.c,v 1.61 2002/07/18 19:01:44 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1340,7 +1340,12 @@
 
 static int tcl_do_masklist(maskrec *m, Tcl_Interp *irp)
 {
-  char ts[21], ts1[21], ts2[21], *list[6], *p;
+  char ts[21], ts1[21], ts2[21], *p;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+  CONST char *list[6];
+#else
+  char *list[6];
+#endif
 
   for (; m; m = m->next) {
     list[0] = m->mask;
@@ -1674,8 +1679,12 @@
   int items;
   int ret = TCL_OK;
   int join = 0;
-  char **item;
   char buf[2048], buf2[256];
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+  CONST char **item;
+#else
+  char **item;
+#endif
 
   if (!newname || !newname[0] || !strchr(CHANMETA, newname[0])) {
     if (irp)
Index: eggdrop1.6/src/mod/irc.mod/irc.c
diff -u eggdrop1.6/src/mod/irc.mod/irc.c:1.71 eggdrop1.6/src/mod/irc.mod/irc.c:1.72
--- eggdrop1.6/src/mod/irc.mod/irc.c:1.71	Sat Jun 15 23:45:44 2002
+++ eggdrop1.6/src/mod/irc.mod/irc.c	Thu Jul 18 14:01:45 2002
@@ -2,7 +2,7 @@
  * irc.c -- part of irc.mod
  *   support for channels within the bot
  *
- * $Id: irc.c,v 1.71 2002/06/16 04:45:44 wcc Exp $
+ * $Id: irc.c,v 1.72 2002/07/18 19:01:45 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1041,15 +1041,25 @@
   add_hook(HOOK_RFC_CASECMP, (Function) rfc_compliant);
 }
 
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
 static char *traced_nettype(ClientData cdata, Tcl_Interp *irp, char *name1,
-			    char *name2, int flags)
+			    CONST char *name2, int flags)
+#else
+static char *traced_nettype(ClientData cdata, Tcl_Interp *irp, char *name1,
+                            char *name2, int flags)
+#endif
 {
   do_nettype();
   return NULL;
 }
 
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
 static char *traced_rfccompliant(ClientData cdata, Tcl_Interp *irp,
-				 char *name1, char *name2, int flags)
+				 char *name1, CONST char *name2, int flags)
+#else
+static char *traced_rfccompliant(ClientData cdata, Tcl_Interp *irp,
+                                 char *name1, char *name2, int flags)
+#endif
 {
   /* This hook forces eggdrop core to change the rfc_ match function
    * links to point to the rfc compliant versions if rfc_compliant
Index: eggdrop1.6/src/mod/irc.mod/tclirc.c
diff -u eggdrop1.6/src/mod/irc.mod/tclirc.c:1.35 eggdrop1.6/src/mod/irc.mod/tclirc.c:1.36
--- eggdrop1.6/src/mod/irc.mod/tclirc.c:1.35	Thu Jun 13 15:43:08 2002
+++ eggdrop1.6/src/mod/irc.mod/tclirc.c	Thu Jul 18 14:01:45 2002
@@ -1,7 +1,7 @@
 /*
  * tclirc.c -- part of irc.mod
  *
- * $Id: tclirc.c,v 1.35 2002/06/13 20:43:08 wcc Exp $
+ * $Id: tclirc.c,v 1.36 2002/07/18 19:01:45 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -509,7 +509,12 @@
 
 static inline int tcl_chanmasks(masklist *m, Tcl_Interp *irp)
 {
-  char *list[3], work[20], *p;
+  char work[20], *p;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+  CONST char *list[3];
+#else
+  char *list[3];
+#endif
 
   for (; m && m->mask && m->mask[0]; m = m->next) {
     list[0] = m->mask;
Index: eggdrop1.6/src/mod/notes.mod/notes.c
diff -u eggdrop1.6/src/mod/notes.mod/notes.c:1.39 eggdrop1.6/src/mod/notes.mod/notes.c:1.40
--- eggdrop1.6/src/mod/notes.mod/notes.c:1.39	Thu Jun  6 13:52:24 2002
+++ eggdrop1.6/src/mod/notes.mod/notes.c	Thu Jul 18 14:01:45 2002
@@ -5,7 +5,7 @@
  *   note cmds
  *   note ignores
  *
- * $Id: notes.c,v 1.39 2002/06/06 18:52:24 wcc Exp $
+ * $Id: notes.c,v 1.40 2002/07/18 19:01:45 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -664,7 +664,12 @@
   FILE *f;
   char s[601], *to, *from, *dt, *s1;
   int count, read, nl[128];	/* Is it enough? */
-  char *list[3], *p;
+  char *p;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+  CONST char *list[3];
+#else
+  char *list[3];
+#endif
 
   BADARGS(2, 3, " handle ?noteslist#?");
   if (!get_user_by_handle(userlist, argv[1])) {
Index: eggdrop1.6/src/mod/server.mod/server.c
diff -u eggdrop1.6/src/mod/server.mod/server.c:1.78 eggdrop1.6/src/mod/server.mod/server.c:1.79
--- eggdrop1.6/src/mod/server.mod/server.c:1.78	Thu Jun  6 13:52:25 2002
+++ eggdrop1.6/src/mod/server.mod/server.c	Thu Jul 18 14:01:45 2002
@@ -2,7 +2,7 @@
  * server.c -- part of server.mod
  *   basic irc server support
  *
- * $Id: server.c,v 1.78 2002/06/06 18:52:25 wcc Exp $
+ * $Id: server.c,v 1.79 2002/07/18 19:01:45 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -1116,8 +1116,14 @@
 
 /* Read/write normal string variable.
  */
+
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+static char *nick_change(ClientData cdata, Tcl_Interp *irp, char *name1,
+			 CONST char *name2, int flags)
+#else
 static char *nick_change(ClientData cdata, Tcl_Interp *irp, char *name1,
-			 char *name2, int flags)
+                         char *name2, int flags)
+#endif
 {
   char *new;
 
@@ -1169,16 +1175,26 @@
     return altnick;
 }
 
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+static char *altnick_change(ClientData cdata, Tcl_Interp *irp, char *name1,
+			    CONST char *name2, int flags)
+#else
 static char *altnick_change(ClientData cdata, Tcl_Interp *irp, char *name1,
-			    char *name2, int flags)
+                            char *name2, int flags)
+#endif
 {
   /* Always unset raltnick. Will be regenerated when needed. */
   raltnick[0] = 0;
   return NULL;
 }
 
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
 static char *traced_server(ClientData cdata, Tcl_Interp *irp, char *name1,
-			   char *name2, int flags)
+			   CONST char *name2, int flags)
+#else
+static char *traced_server(ClientData cdata, Tcl_Interp *irp, char *name1,
+                           char *name2, int flags)
+#endif
 {
   char s[1024];
 
@@ -1195,8 +1211,13 @@
   return NULL;
 }
 
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+static char *traced_botname(ClientData cdata, Tcl_Interp *irp, char *name1,
+			    CONST char *name2, int flags)
+#else
 static char *traced_botname(ClientData cdata, Tcl_Interp *irp, char *name1,
-			    char *name2, int flags)
+                            char *name2, int flags)
+#endif
 {
   char s[1024];
 
@@ -1245,15 +1266,26 @@
   }
 }
 
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
 static char *traced_nettype(ClientData cdata, Tcl_Interp *irp, char *name1,
-			    char *name2, int flags)
+			    CONST char *name2, int flags)
+#else
+static char *traced_nettype(ClientData cdata, Tcl_Interp *irp, char *name1,
+                            char *name2, int flags)
+#endif
 {
   do_nettype();
   return NULL;
 }
 
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+static char *traced_nicklen(ClientData cdata, Tcl_Interp *irp, char *name1,
+			    CONST char *name2, int flags)
+#else
 static char *traced_nicklen(ClientData cdata, Tcl_Interp *irp, char *name1,
-			    char *name2, int flags)
+                            char *name2, int flags)
+#endif
+
 {
   if (flags & (TCL_TRACE_READS | TCL_TRACE_UNSETS)) {
     char s[40];
@@ -1335,13 +1367,24 @@
 
 /* Read or write the server list.
  */
+
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+static char *tcl_eggserver(ClientData cdata, Tcl_Interp *irp, char *name1,
+			   CONST char *name2, int flags)
+#else
 static char *tcl_eggserver(ClientData cdata, Tcl_Interp *irp, char *name1,
-			   char *name2, int flags)
+                           char *name2, int flags)
+#endif
 {
   Tcl_DString ds;
-  char *slist, **list, x[1024];
+  char *slist, x[1024];
   struct server_list *q;
   int lc, code, i;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+  CONST char **list;
+#else
+  char **list;
+#endif
 
   if (flags & (TCL_TRACE_READS | TCL_TRACE_UNSETS)) {
     /* Create server list */
@@ -1366,7 +1409,7 @@
       if (code == TCL_ERROR)
 	return interp->result;
       for (i = 0; i < lc && i < 50; i++)
-	add_server(list[i]);
+	add_server((char *)list[i]);
 
       /* Tricky way to make the bot reset its server pointers
        * perform part of a '.jump <current-server>':
Index: eggdrop1.6/src/patch.h
diff -u eggdrop1.6/src/patch.h:1.776 eggdrop1.6/src/patch.h:1.777
--- eggdrop1.6/src/patch.h:1.776	Wed Jul 17 14:18:29 2002
+++ eggdrop1.6/src/patch.h	Thu Jul 18 14:01:44 2002
@@ -10,7 +10,7 @@
  * statement, leave the rest of the file alone, this allows better
  * overlapping patches.
  *
- * $Id: patch.h,v 1.776 2002/07/17 19:18:29 wcc Exp $
+ * $Id: patch.h,v 1.777 2002/07/18 19:01:44 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -41,12 +41,12 @@
  *
  *
  */
-patch("1026933407");		/* current unixtime */
+patch("1027018586");		/* current unixtime */
 /*
  *
  *
  */
-patch("stripandnotc-docs");
+patch("tcl84fixes");
 /*
  *
  *
Index: eggdrop1.6/src/tcl.c
diff -u eggdrop1.6/src/tcl.c:1.46 eggdrop1.6/src/tcl.c:1.47
--- eggdrop1.6/src/tcl.c:1.46	Mon Mar 11 13:22:30 2002
+++ eggdrop1.6/src/tcl.c	Thu Jul 18 14:01:44 2002
@@ -4,7 +4,7 @@
  *   Tcl initialization
  *   getting and setting Tcl/eggdrop variables
  *
- * $Id: tcl.c,v 1.46 2002/03/11 19:22:30 stdarg Exp $
+ * $Id: tcl.c,v 1.47 2002/07/18 19:01:44 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -135,8 +135,13 @@
 } coupletinfo;
 
 /* Read/write integer couplets (int1:int2) */
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+static char *tcl_eggcouplet(ClientData cdata, Tcl_Interp *irp, char *name1,
+                            CONST char *name2, int flags)
+#else
 static char *tcl_eggcouplet(ClientData cdata, Tcl_Interp *irp, char *name1,
 			    char *name2, int flags)
+#endif
 {
   char *s, s1[41];
   coupletinfo *cp = (coupletinfo *) cdata;
@@ -149,7 +154,7 @@
 		   TCL_TRACE_READS | TCL_TRACE_WRITES | TCL_TRACE_UNSETS,
 		   tcl_eggcouplet, cdata);
   } else {			/* writes */
-    s = Tcl_GetVar2(interp, name1, name2, TCL_GLOBAL_ONLY);
+    s = (char *) Tcl_GetVar2(interp, name1, name2, TCL_GLOBAL_ONLY);
     if (s != NULL) {
       int nr1, nr2;
 
@@ -165,8 +170,13 @@
 
 /* Read or write normal integer.
  */
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
 static char *tcl_eggint(ClientData cdata, Tcl_Interp *irp, char *name1,
-			char *name2, int flags)
+			CONST char *name2, int flags)
+#else
+static char *tcl_eggint(ClientData cdata, Tcl_Interp *irp, char *name1,
+                        char *name2, int flags)
+#endif
 {
   char *s, s1[40];
   long l;
@@ -192,7 +202,7 @@
 		   tcl_eggint, cdata);
     return NULL;
   } else {			/* Writes */
-    s = Tcl_GetVar2(interp, name1, name2, TCL_GLOBAL_ONLY);
+    s = (char *) Tcl_GetVar2(interp, name1, name2, TCL_GLOBAL_ONLY);
     if (s != NULL) {
       if ((int *) ii->var == &conmask) {
 	if (s[0])
@@ -236,8 +246,13 @@
 
 /* Read/write normal string variable
  */
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+static char *tcl_eggstr(ClientData cdata, Tcl_Interp *irp, char *name1,
+                        CONST char *name2, int flags)
+#else
 static char *tcl_eggstr(ClientData cdata, Tcl_Interp *irp, char *name1,
 			char *name2, int flags)
+#endif
 {
   char *s;
   strinfo *st = (strinfo *) cdata;
@@ -262,7 +277,7 @@
       Tcl_SetVar2(interp, name1, name2, st->str, TCL_GLOBAL_ONLY);
       return "read-only variable";
     }
-    s = Tcl_GetVar2(interp, name1, name2, TCL_GLOBAL_ONLY);
+    s = (char *) Tcl_GetVar2(interp, name1, name2, TCL_GLOBAL_ONLY);
     if (s != NULL) {
       if (strlen(s) > abs(st->max))
 	s[abs(st->max)] = 0;
Index: eggdrop1.6/src/tcldcc.c
diff -u eggdrop1.6/src/tcldcc.c:1.33 eggdrop1.6/src/tcldcc.c:1.34
--- eggdrop1.6/src/tcldcc.c:1.33	Tue Jan  1 21:46:36 2002
+++ eggdrop1.6/src/tcldcc.c	Thu Jul 18 14:01:44 2002
@@ -2,7 +2,7 @@
  * tcldcc.c -- handles:
  *   Tcl stubs for the dcc commands
  *
- * $Id: tcldcc.c,v 1.33 2002/01/02 03:46:36 guppy Exp $
+ * $Id: tcldcc.c,v 1.34 2002/07/18 19:01:44 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -564,8 +564,13 @@
 static int tcl_botlist STDVAR
 {
   tand_t *bot;
-  char *list[4], *p;
+  char *p;
   char sh[2], string[20];
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+    CONST char *list[4];
+#else
+    char *list[4];
+#endif
 
   BADARGS(1, 1, "");
   sh[1] = 0;
@@ -590,8 +595,13 @@
   int i;
   char idxstr[10];
   char timestamp[11];
-  char *list[6], *p;
+  char *p;
   char other[160];
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+    CONST char *list[6];
+#else
+    char *list[6];
+#endif
 
   BADARGS(1, 2, " ?type?");
   for (i = 0; i < dcc_total; i++) {
@@ -624,8 +634,13 @@
  */
 static int tcl_whom STDVAR
 {
-  char c[2], idle[11], work[20], *list[7], *p;
+  char c[2], idle[11], work[20], *p;
   int chan, i;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+    CONST char *list[7];
+#else
+    char *list[7];
+#endif
 
   BADARGS(2, 2, " chan");
   if (argv[1][0] == '*')
Index: eggdrop1.6/src/tclmisc.c
diff -u eggdrop1.6/src/tclmisc.c:1.29 eggdrop1.6/src/tclmisc.c:1.30
--- eggdrop1.6/src/tclmisc.c:1.29	Tue Jan  1 21:46:36 2002
+++ eggdrop1.6/src/tclmisc.c	Thu Jul 18 14:01:44 2002
@@ -2,7 +2,7 @@
  * tclmisc.c -- handles:
  *   Tcl stubs for everything else
  *
- * $Id: tclmisc.c,v 1.29 2002/01/02 03:46:36 guppy Exp $
+ * $Id: tclmisc.c,v 1.30 2002/07/18 19:01:44 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -174,8 +174,13 @@
   tcl_bind_list_t	*tl, *tl_kind;
   tcl_bind_mask_t	*tm;
   tcl_cmd_t		*tc;
-  char			*list[5], *g, flg[100], hits[11];
+  char			*g, flg[100], hits[11];
   int			 matching = 0;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+    CONST char *list[5];
+#else
+    char *list[5];
+#endif
 
   BADARGS(1, 2, " ?type/mask?");
   if (argv[1])
@@ -512,9 +517,14 @@
 {
   module_entry *current;
   dependancy *dep;
-  char *list[100], *list2[2], *p;
+  char *p;
   char s[24], s2[24];
   int i;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+    CONST char *list[100], *list2[2];
+#else
+    char *list[100], *list2[2];
+#endif
 
   BADARGS(1, 1, "");
   for (current = module_list; current; current = current->next) {
Index: eggdrop1.6/src/tcluser.c
diff -u eggdrop1.6/src/tcluser.c:1.29 eggdrop1.6/src/tcluser.c:1.30
--- eggdrop1.6/src/tcluser.c:1.29	Tue Jan  1 21:46:36 2002
+++ eggdrop1.6/src/tcluser.c	Thu Jul 18 14:01:44 2002
@@ -2,7 +2,7 @@
  * tcluser.c -- handles:
  *   Tcl stubs for the user-record-oriented commands
  *
- * $Id: tcluser.c,v 1.29 2002/01/02 03:46:36 guppy Exp $
+ * $Id: tcluser.c,v 1.30 2002/07/18 19:01:44 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -454,7 +454,12 @@
 static int tcl_ignorelist STDVAR
 {
   struct igrec *i;
-  char expire[11], added[11], *list[5], *p;
+  char expire[11], added[11], *p;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+    CONST char *list[5];
+#else
+    char *list[5];
+#endif
 
   BADARGS(1, 1, "");
   for (i = global_ign; i; i = i->next) {
Index: eggdrop1.6/src/userent.c
diff -u eggdrop1.6/src/userent.c:1.23 eggdrop1.6/src/userent.c:1.24
--- eggdrop1.6/src/userent.c:1.23	Tue Jan  1 21:46:36 2002
+++ eggdrop1.6/src/userent.c	Thu Jul 18 14:01:44 2002
@@ -2,7 +2,7 @@
  * userent.c -- handles:
  *   user-entry handling, new stylem more versatile.
  *
- * $Id: userent.c,v 1.23 2002/01/02 03:46:36 guppy Exp $
+ * $Id: userent.c,v 1.24 2002/07/18 19:01:44 guppy Exp $
  */
 /*
  * Copyright (C) 1997 Robey Pointer
@@ -780,7 +780,11 @@
 {
   int code, lc, j;
   struct xtra_key *xk;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+  CONST char **list;
+#else
   char **list;
+#endif
 
   code = Tcl_SplitList(interp, whois_fields, &lc, &list);
   if (code == TCL_ERROR)
@@ -883,7 +887,12 @@
     return TCL_OK;
   }
   for (x = e->u.extra; x; x = x->next) {
-    char *p, *list[2];
+    char *p;
+#if ((TCL_MAJOR_VERSION == 8) && (TCL_MINOR_VERSION >= 4))
+    CONST char *list[2];
+#else
+    char *list[2];
+#endif
 
     list[0] = x->key;
     list[1] = x->data;
----------------------- End of diff -----------------------



More information about the Changes mailing list