Index: src/modules.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.6/src/modules.c,v
retrieving revision 1.104
diff -u -r1.104 modules.c
--- src/modules.c	7 Jan 2010 13:48:31 -0000	1.104
+++ src/modules.c	6 Feb 2010 15:52:57 -0000
@@ -287,9 +287,9 @@
   (Function) chanout_but,
   /* 72 - 75 */
   (Function) check_validity,
-  (Function) list_delete,
-  (Function) list_append,
-  (Function) list_contains,
+  (Function) egg_list_delete,
+  (Function) egg_list_append,
+  (Function) egg_list_contains,
   /* 76 - 79 */
   (Function) answer,
   (Function) getmyip,
Index: src/tcluser.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.6/src/tcluser.c,v
retrieving revision 1.49
diff -u -r1.49 tcluser.c
--- src/tcluser.c	4 Jan 2010 13:15:11 -0000	1.49
+++ src/tcluser.c	6 Feb 2010 15:52:57 -0000
@@ -589,7 +589,7 @@
   }
   r = et->tcl_set(irp, u, e, argc, argv);
   /* Yeah... e is freed, and we read it... (tcl: setuser hand HOSTS none) */
-  if ((!e->u.list) && (list_delete((struct list_type **) &(u->entries),
+  if ((!e->u.list) && (egg_list_delete((struct list_type **) &(u->entries),
       (struct list_type *) e)))
     nfree(e);
     /* else maybe already freed... (entry_type==HOSTS) <drummer> */
Index: src/userent.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.6/src/userent.c,v
retrieving revision 1.39
diff -u -r1.39 userent.c
--- src/userent.c	7 Jan 2010 13:48:31 -0000	1.39
+++ src/userent.c	6 Feb 2010 15:52:57 -0000
@@ -684,7 +684,7 @@
     shareout(NULL, "c XTRA %s %s %s\n", u->handle, new->key,
              new->data ? new->data : "");
   if ((old && old != new) || !new->data || !new->data[0]) {
-    list_delete(&e->u.list, (struct list_type *) old);
+    egg_list_delete(&e->u.list, (struct list_type *) old);
     nfree(old->key);
     nfree(old->data);
     nfree(old);
@@ -1080,14 +1080,14 @@
   "HOSTS"
 };
 
-int list_append(struct list_type **h, struct list_type *i)
+int egg_list_append(struct list_type **h, struct list_type *i)
 {
   for (; *h; h = &((*h)->next));
   *h = i;
   return 1;
 }
 
-int list_delete(struct list_type **h, struct list_type *i)
+int egg_list_delete(struct list_type **h, struct list_type *i)
 {
   for (; *h; h = &((*h)->next))
     if (*h == i) {
@@ -1097,7 +1097,7 @@
   return 0;
 }
 
-int list_contains(struct list_type *h, struct list_type *i)
+int egg_list_contains(struct list_type *h, struct list_type *i)
 {
   for (; h; h = h->next)
     if (h == i) {
@@ -1138,7 +1138,7 @@
       e->type = NULL;
     }
   }
-  return list_delete((struct list_type **) &entry_type_list,
+  return egg_list_delete((struct list_type **) &entry_type_list,
                      (struct list_type *) type);
 }
 
@@ -1198,7 +1198,7 @@
   }
   r = et->set(u, e, d);
   if (!e->u.list) {
-    list_delete((struct list_type **) &(u->entries), (struct list_type *) e);
+    egg_list_delete((struct list_type **) &(u->entries), (struct list_type *) e);
     nfree(e);
   }
   return r;
Index: src/users.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.6/src/users.c,v
retrieving revision 1.58
diff -u -r1.58 users.c
--- src/users.c	7 Jan 2010 13:48:31 -0000	1.58
+++ src/users.c	6 Feb 2010 15:52:57 -0000
@@ -885,7 +885,7 @@
                 list->next = NULL;
                 list->extra = user_malloc(strlen(s) + 1);
                 strcpy(list->extra, s);
-                list_append((&ue->u.list), list);
+                egg_list_append((&ue->u.list), list);
                 ok = 1;
               }
             if (!ok) {
Index: src/users.h
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.6/src/users.h,v
retrieving revision 1.19
diff -u -r1.19 users.h
--- src/users.h	3 Jan 2010 13:27:32 -0000	1.19
+++ src/users.h	6 Feb 2010 15:52:57 -0000
@@ -36,9 +36,9 @@
         (b)->next = *(a);                                               \
         *(a) = (b);                                                     \
 }
-int list_append(struct list_type **, struct list_type *);
-int list_delete(struct list_type **, struct list_type *);
-int list_contains(struct list_type *, struct list_type *);
+int egg_list_append(struct list_type **, struct list_type *);
+int egg_list_delete(struct list_type **, struct list_type *);
+int egg_list_contains(struct list_type *, struct list_type *);
 
 
 /* New userfile format stuff
Index: src/mod/module.h
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.6/src/mod/module.h,v
retrieving revision 1.91
diff -u -r1.91 module.h
--- src/mod/module.h	7 Jan 2010 13:48:31 -0000	1.91
+++ src/mod/module.h	6 Feb 2010 15:52:58 -0000
@@ -188,9 +188,9 @@
 #define chanout_but ((void(*)())global[71])
 /* 72 - 75 */
 #define check_validity ((int (*) (char *,Function))global[72])
-#define list_delete ((int (*)( struct list_type **, struct list_type *))global[73])
-#define list_append ((int (*) ( struct list_type **, struct list_type *))global[74])
-#define list_contains ((int (*) (struct list_type *, struct list_type *))global[75])
+#define egg_list_delete ((int (*)( struct list_type **, struct list_type *))global[73])
+#define egg_list_append ((int (*) ( struct list_type **, struct list_type *))global[74])
+#define egg_list_contains ((int (*) (struct list_type *, struct list_type *))global[75])
 /* 76 - 79 */
 #define answer ((int (*) (int,char *,unsigned long *,unsigned short *,int))global[76])
 #define getmyip ((IP (*) (void))global[77])
Index: src/mod/channels.mod/tclchan.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.6/src/mod/channels.mod/tclchan.c,v
retrieving revision 1.102
diff -u -r1.102 tclchan.c
--- src/mod/channels.mod/tclchan.c	3 Jan 2010 13:27:41 -0000	1.102
+++ src/mod/channels.mod/tclchan.c	6 Feb 2010 15:52:59 -0000
@@ -1946,7 +1946,7 @@
 
     /* Initialize chan->channel info */
     init_channel(chan, 0);
-    list_append((struct list_type **) &chanset, (struct list_type *) chan);
+    egg_list_append((struct list_type **) &chanset, (struct list_type *) chan);
     /* Channel name is stored in xtra field for sharebot stuff */
     join = 1;
   }
Index: src/mod/server.mod/server.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.6/src/mod/server.mod/server.c,v
retrieving revision 1.134
diff -u -r1.134 server.c
--- src/mod/server.mod/server.c	3 Jan 2010 13:27:55 -0000	1.134
+++ src/mod/server.mod/server.c	6 Feb 2010 15:53:02 -0000
@@ -1052,7 +1052,8 @@
       strcpy(x->pass, pass);
     } else
       x->pass = NULL;
-    list_append((struct list_type **) (&serverlist), (struct list_type *) x);
+    egg_list_append((struct list_type **) (&serverlist),
+                    (struct list_type *) x);
     *ptr = i;
     return;
   }
Index: src/mod/share.mod/share.c
===================================================================
RCS file: /usr/local/cvsroot/eggdrop1.6/src/mod/share.mod/share.c,v
retrieving revision 1.90
diff -u -r1.90 share.c
--- src/mod/share.mod/share.c	3 Jan 2010 13:27:55 -0000	1.90
+++ src/mod/share.mod/share.c	6 Feb 2010 15:53:03 -0000
@@ -630,7 +630,7 @@
           }
           uet->got_share(u, e, par, idx);
           if (!e->u.list) {
-            list_delete((struct list_type **) &(u->entries),
+            egg_list_delete((struct list_type **) &(u->entries),
                         (struct list_type *) e);
             nfree(e);
           }
@@ -1694,7 +1694,7 @@
             list->next = NULL;
             list->extra = user_malloc(strlen(lt->extra) + 1);
             strcpy(list->extra, lt->extra);
-            list_append((&nue->u.list), list);
+            egg_list_append((&nue->u.list), list);
           }
         } else {
           if (ue->type->dup_user && (t || ue->type->got_share))