diff -crN ../tmp/irc2.10.3p7+hemp2+jp6/ircd/channel.c ircd/channel.c
*** ../tmp/irc2.10.3p7+hemp2+jp6/ircd/channel.c	Tue Mar  9 18:39:08 2004
--- ircd/channel.c	Mon Sep 24 16:31:05 2007
***************
*** 2149,2155 ****
  		if (*chptr->chname == '!' && close_chid(chptr->chname+1))
  			cache_chid(chptr);
  		else
! 			MyFree((char *)chptr);
  	    }
  }
  
--- 2149,2155 ----
  		if (*chptr->chname == '!' && close_chid(chptr->chname+1))
  			cache_chid(chptr);
  		else
! 			MyFree(chptr);
  	    }
  }
  
***************
*** 3256,3261 ****
--- 3256,3263 ----
  			sendto_one(sptr, ":%s NOTICE %s :%s", ME, parv[0],
  				LIST_ALIS_NOTE);
  		}
+ #else
+ 	;
  #endif
  	}
  	else
diff -crN ../tmp/irc2.10.3p7+hemp2+jp6/ircd/list.c ircd/list.c
*** ../tmp/irc2.10.3p7+hemp2+jp6/ircd/list.c	Mon May 10 16:12:57 2004
--- ircd/list.c	Mon Sep 24 16:34:50 2007
***************
*** 152,158 ****
  		if (cptr->reason)
  			MyFree(cptr->reason);
  	}
! 	MyFree((char *)cptr);
  }
  
  /*
--- 152,158 ----
  		if (cptr->reason)
  			MyFree(cptr->reason);
  	}
! 	MyFree(cptr);
  }
  
  /*
***************
*** 261,267 ****
  		    {
  			istat.is_away--;
  			istat.is_awaymem -= (strlen(user->away) + 1);
! 			MyFree((char *)user->away);
  		    }
  		/*
  		 * sanity check
--- 261,267 ----
  		    {
  			istat.is_away--;
  			istat.is_awaymem -= (strlen(user->away) + 1);
! 			MyFree(user->away);
  		    }
  		/*
  		 * sanity check
***************
*** 288,294 ****
  				    user->username, user->host, buf);
  #endif
  		    }
! 		MyFree((char *)user);
  #ifdef	DEBUGMODE
  		users.inuse--;
  #endif
--- 288,294 ----
  				    user->username, user->host, buf);
  #endif
  		    }
! 		MyFree(user);
  #ifdef	DEBUGMODE
  		users.inuse--;
  #endif
***************
*** 320,328 ****
  		    }
  		if (serv->up && serv->up != ME)
  		{
! 			MyFree((char *)serv->up);
  		}
! 		MyFree((char *)serv);
  	    }
  }
  
--- 320,328 ----
  		    }
  		if (serv->up && serv->up != ME)
  		{
! 			MyFree(serv->up);
  		}
! 		MyFree(serv);
  	    }
  }
  
***************
*** 527,533 ****
  void	free_link(lp)
  Reg	Link	*lp;
  {
! 	MyFree((char *)lp);
  #ifdef	DEBUGMODE
  	links.inuse--;
  #endif
--- 527,533 ----
  void	free_link(lp)
  Reg	Link	*lp;
  {
! 	MyFree(lp);
  #ifdef	DEBUGMODE
  	links.inuse--;
  #endif
***************
*** 536,542 ****
  void	free_invlink(lp)
  Reg	invLink	*lp;
  {
! 	MyFree((char *)lp);
  #ifdef	DEBUGMODE
  	links.inuse--;
  #endif
--- 536,542 ----
  void	free_invlink(lp)
  Reg	invLink	*lp;
  {
! 	MyFree(lp);
  #ifdef	DEBUGMODE
  	links.inuse--;
  #endif
***************
*** 556,562 ****
  void	free_class(tmp)
  Reg	aClass	*tmp;
  {
! 	MyFree((char *)tmp);
  #ifdef	DEBUGMODE
  	classs.inuse--;
  #endif
--- 556,562 ----
  void	free_class(tmp)
  Reg	aClass	*tmp;
  {
! 	MyFree(tmp);
  #ifdef	DEBUGMODE
  	classs.inuse--;
  #endif
***************
*** 619,630 ****
  	if (aconf->passwd)
  		bzero(aconf->passwd, strlen(aconf->passwd));
  	if (aconf->ping)
! 		MyFree((char *)aconf->ping);
  	if (aconf->source_ip)
  		MyFree(aconf->source_ip);
  	MyFree(aconf->passwd);
  	MyFree(aconf->name);
! 	MyFree((char *)aconf);
  #ifdef	DEBUGMODE
  	aconfs.inuse--;
  #endif
--- 619,630 ----
  	if (aconf->passwd)
  		bzero(aconf->passwd, strlen(aconf->passwd));
  	if (aconf->ping)
! 		MyFree(aconf->ping);
  	if (aconf->source_ip)
  		MyFree(aconf->source_ip);
  	MyFree(aconf->passwd);
  	MyFree(aconf->name);
! 	MyFree(aconf);
  #ifdef	DEBUGMODE
  	aconfs.inuse--;
  #endif
diff -crN ../tmp/irc2.10.3p7+hemp2+jp6/ircd/res.c ircd/res.c
*** ../tmp/irc2.10.3p7+hemp2+jp6/ircd/res.c	Mon May 10 16:12:57 2004
--- ircd/res.c	Mon Sep 24 16:38:08 2007
***************
*** 194,206 ****
  #endif
  	r2ptr = old;
  	if (r2ptr->he.h_name)
! 		MyFree((char *)r2ptr->he.h_name);
  	for (i = 0; i < MAXALIASES; i++)
  		if ((s = r2ptr->he.h_aliases[i]))
  			MyFree(s);
  	if (r2ptr->name)
  		MyFree(r2ptr->name);
! 	MyFree((char *)r2ptr);
  
  	return;
  }
--- 194,206 ----
  #endif
  	r2ptr = old;
  	if (r2ptr->he.h_name)
! 		MyFree(r2ptr->he.h_name);
  	for (i = 0; i < MAXALIASES; i++)
  		if ((s = r2ptr->he.h_aliases[i]))
  			MyFree(s);
  	if (r2ptr->name)
  		MyFree(r2ptr->name);
! 	MyFree(r2ptr);
  
  	return;
  }
***************
*** 1507,1513 ****
  		if (*cpp == cp)
  		    {
  			*cpp = cp->list_next;
! 			MyFree((char *)cp);
  			break;
  		    }
  	return cr;
--- 1507,1513 ----
  		if (*cpp == cp)
  		    {
  			*cpp = cp->list_next;
! 			MyFree(cp);
  			break;
  		    }
  	return cr;
***************
*** 1594,1600 ****
  	    {
  		for (hashv = 0; hp->h_aliases[hashv]; hashv++)
  			MyFree(hp->h_aliases[hashv]);
! 		MyFree((char *)hp->h_aliases);
  	    }
  
  	/*
--- 1594,1600 ----
  	    {
  		for (hashv = 0; hp->h_aliases[hashv]; hashv++)
  			MyFree(hp->h_aliases[hashv]);
! 		MyFree(hp->h_aliases);
  	    }
  
  	/*
***************
*** 1603,1613 ****
  	if (hp->h_addr_list)
  	    {
  		if (*hp->h_addr_list)
! 			MyFree((char *)*hp->h_addr_list);
! 		MyFree((char *)hp->h_addr_list);
  	    }
  
! 	MyFree((char *)ocp);
  
  	incache--;
  	cainfo.ca_dels++;
--- 1603,1613 ----
  	if (hp->h_addr_list)
  	    {
  		if (*hp->h_addr_list)
! 			MyFree(*hp->h_addr_list);
! 		MyFree(hp->h_addr_list);
  	    }
  
! 	MyFree(ocp);
  
  	incache--;
  	cainfo.ca_dels++;
diff -crN ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_bsd.c ircd/s_bsd.c
*** ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_bsd.c	Mon May 10 16:12:57 2004
--- ircd/s_bsd.c	Mon Sep 24 16:39:03 2007
***************
*** 1590,1596 ****
  		    {
  			blptr= *blscn;
  			*blscn=blptr->next;
! 			MyFree((char *)blptr);
  		    }
  		else
  			blscn = &(*blscn)->next;
--- 1590,1596 ----
  		    {
  			blptr= *blscn;
  			*blscn=blptr->next;
! 			MyFree(blptr);
  		    }
  		else
  			blscn = &(*blscn)->next;
diff -crN ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_id.c ircd/s_id.c
*** ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_id.c	Tue Mar  9 17:21:55 2004
--- ircd/s_id.c	Mon Sep 24 16:40:39 2007
***************
*** 140,146 ****
      if (chptr->history == 0 ||
  	(timeofday - chptr->history) >LDELAYCHASETIMELIMIT+DELAYCHASETIMELIMIT)
  	{
! 	    MyFree((char *)chptr);
  	    return;
  	}
  
--- 140,146 ----
      if (chptr->history == 0 ||
  	(timeofday - chptr->history) >LDELAYCHASETIMELIMIT+DELAYCHASETIMELIMIT)
  	{
! 	    MyFree(chptr);
  	    return;
  	}
  
***************
*** 182,188 ****
  		    *chptr = del->nextch;
  		    istat.is_cchan--;
  		    istat.is_cchanmem -= sizeof(aChannel) +strlen(del->chname);
! 		    MyFree((char *)del);
  		}
  	    else
  		    chptr = &((*chptr)->nextch);
--- 182,188 ----
  		    *chptr = del->nextch;
  		    istat.is_cchan--;
  		    istat.is_cchanmem -= sizeof(aChannel) +strlen(del->chname);
! 		    MyFree(del);
  		}
  	    else
  		    chptr = &((*chptr)->nextch);
diff -crN ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_misc.c ircd/s_misc.c
*** ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_misc.c	Mon May 10 16:12:57 2004
--- ircd/s_misc.c	Mon Sep 24 16:41:28 2007
***************
*** 1274,1280 ****
  	    {
  		last = motd->next;
  		MyFree(motd->line);
! 		MyFree((char *)motd);
  	    }
  	motd_tm = *localtime(&Sb.st_mtime);
  	(void)dgets(-1, NULL, 0); /* make sure buffer is at empty pos */
--- 1274,1280 ----
  	    {
  		last = motd->next;
  		MyFree(motd->line);
! 		MyFree(motd);
  	    }
  	motd_tm = *localtime(&Sb.st_mtime);
  	(void)dgets(-1, NULL, 0); /* make sure buffer is at empty pos */
diff -crN ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_serv.c ircd/s_serv.c
*** ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_serv.c	Mon May 10 16:12:57 2004
--- ircd/s_serv.c	Mon Sep 24 15:42:41 2007
***************
*** 2914,2919 ****
--- 2914,2920 ----
  	"ON",
  	NULL
  };
+ #ifdef SPLIT_HANDLE
  static struct Set_Message set_msgtab[] =
  {
  	{"ACONNECT",&iconf.aconnect,def_values},
***************
*** 2922,2927 ****
--- 2923,2929 ----
  #endif
  	{NULL,NULL,NULL}
  };
+ #endif
  static void set_action(option,value)
  char *option;
  int value;
diff -crN ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_service.c ircd/s_service.c
*** ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_service.c	Tue Mar  9 17:29:49 2004
--- ircd/s_service.c	Mon Sep 24 16:42:43 2007
***************
*** 70,76 ****
  			free_server(serv->servp, cptr);
  		if (serv->server)
  			MyFree(serv->server);
! 		MyFree((char *)serv);
  		cptr->service = NULL;
  	    }
  }
--- 70,76 ----
  			free_server(serv->servp, cptr);
  		if (serv->server)
  			MyFree(serv->server);
! 		MyFree(serv);
  		cptr->service = NULL;
  	    }
  }
diff -crN ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_user.c ircd/s_user.c
*** ../tmp/irc2.10.3p7+hemp2+jp6/ircd/s_user.c	Tue Mar  9 18:39:08 2004
--- ircd/s_user.c	Mon Sep 24 15:42:41 2007
***************
*** 720,729 ****
--- 720,731 ----
  		user->servp->usercnt[0]++;
  
  	}
+ #ifdef SPLIT_HANDLE
  	if (istat.is_user[1] + istat.is_user[0] >= SPLIT_USERS)
  	{
  		check_split();
  	}
+ #endif
  #ifdef	EXTRA_STATISTICS
  	/*
  	**  Keep track of maximum number of global users.