Remove HEAD_IN_SAND macros, rebuild dependencies

git-svn-id: file:///home/klmitch/undernet-ircu/undernet-ircu-svn/ircu2/trunk@908 c9e4aea6-c8fd-4c43-8297-357d70d61c8c

diff --git a/ChangeLog b/ChangeLog
index bea47241768491913d578d2071b4433630b00cfe..3ff3012d74edb7aab756be5e3c40d3a314b86cc1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2003-01-10  Thomas Helvey <tom.helvey@cox.net>
+       * ircd/map.c, ircd/Makefile.in, include/map.h: Remove 
+        HEAD_IN_SAND macros to get server to build, rebuild dependencies.
 2003-01-08  Fredrik Soderblom <froo@quakenet.org>
         * ircd/s_err.c, ircd/s_user.c (hide_hostmask): Simplify
         RPL_HOSTHIDDEN and the use of it.

diff --git a/include/map.h b/include/map.h
index 91d1a556876f6682cd7eeed5406a80a439c33168..b3e34a950a3e3e7b530134859312748ac2d79c84 100644 (file)
--- a/include/map.h
+++ b/include/map.h
@@ -22,6 +22,9 @@
  *
  * $Id$
  */
+#ifndef INCLUDED_ircd_defs_h
+#include "ircd_defs.h"
+#endif
 #ifndef INCLUDED_time_h
 #include <time.h>              /* struct tm */
 #define INCLUDED_time_h
@@ -31,7 +34,8 @@
 #define INCLUDED_sys_types_h
 #endif
 
-#if defined(HEAD_IN_SAND_MAP) || defined(HEAD_IN_SAND_LINKS)
+
+struct Client;
 
 struct Map {
   time_t lasttime;
@@ -44,7 +48,7 @@ struct Map {
 };
 
 extern void map_update(struct Client *server);
-#endif /* defined(HEAD_IN_SAND_MAP) || defined(HEAD_IN_SAND_LINKS) */
+
 #ifdef HEAD_IN_SAND_LINKS
 extern void map_dump_links_head_in_sand(struct Client *sptr, char *mask);
 #endif /* HEAD_IN_SAND_LINKS */

diff --git a/ircd/Makefile.in b/ircd/Makefile.in
index 0edee0dcda0fc516c9a27cda18ab2cacf0477d4b..abdc7d802bd85f84495879ee9cd3130865d6faf9 100644 (file)
--- a/ircd/Makefile.in
+++ b/ircd/Makefile.in
@@ -367,13 +367,13 @@ channel.o: channel.c ../config.h ../include/channel.h \
   ../include/destruct_event.h ../include/hash.h ../include/ircd.h \
   ../include/struct.h ../include/ircd_alloc.h ../include/ircd_chattr.h \
   ../include/ircd_features.h ../include/ircd_log.h \
-  ../include/ircd_policy.h ../include/ircd_reply.h \
-  ../include/ircd_snprintf.h ../include/ircd_string.h ../include/list.h \
-  ../include/match.h ../include/msg.h ../include/numeric.h \
-  ../include/numnicks.h ../include/querycmds.h ../include/s_bsd.h \
-  ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
-  ../include/s_user.h ../include/send.h ../include/support.h \
-  ../include/sys.h ../include/whowas.h
+  ../include/ircd_reply.h ../include/ircd_snprintf.h \
+  ../include/ircd_string.h ../include/list.h ../include/match.h \
+  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
+  ../include/querycmds.h ../include/s_bsd.h ../include/s_conf.h \
+  ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \
+  ../include/send.h ../include/support.h ../include/sys.h \
+  ../include/whowas.h
 class.o: class.c ../config.h ../include/class.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
@@ -406,12 +406,13 @@ gline.o: gline.c ../config.h ../include/gline.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
   ../include/struct.h ../include/ircd_alloc.h ../include/ircd_features.h \
-  ../include/ircd_log.h ../include/ircd_policy.h ../include/ircd_reply.h \
+  ../include/ircd_log.h ../include/ircd_reply.h \
   ../include/ircd_snprintf.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/match.h ../include/numeric.h \
   ../include/s_bsd.h ../include/s_debug.h ../include/s_misc.h \
-  ../include/send.h ../include/support.h ../include/msg.h \
-  ../include/numnicks.h ../include/sys.h ../include/whocmds.h
+  ../include/s_stats.h ../include/send.h ../include/support.h \
+  ../include/msg.h ../include/numnicks.h ../include/sys.h \
+  ../include/whocmds.h
 hash.o: hash.c ../config.h ../include/hash.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/channel.h \
@@ -427,11 +428,12 @@ ircd.o: ircd.c ../config.h ../include/ircd.h ../include/struct.h \
   ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_signal.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/jupe.h \
   ../include/list.h ../include/match.h ../include/motd.h ../include/msg.h \
-  ../include/numeric.h ../include/numnicks.h ../include/parse.h \
-  ../include/res.h ../include/s_auth.h ../include/s_bsd.h \
-  ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
-  ../include/send.h ../include/sys.h ../include/uping.h \
-  ../include/userload.h ../include/version.h ../include/whowas.h
+  ../include/numeric.h ../include/numnicks.h ../include/opercmds.h \
+  ../include/parse.h ../include/res.h ../include/s_auth.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/s_debug.h \
+  ../include/s_misc.h ../include/s_stats.h ../include/send.h \
+  ../include/sys.h ../include/uping.h ../include/userload.h \
+  ../include/version.h ../include/whowas.h
 ircd_alloc.o: ircd_alloc.c ../config.h ../include/ircd_alloc.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/s_debug.h \
   ../include/ircd_defs.h
@@ -461,10 +463,11 @@ ircd_relay.o: ircd_relay.c ../config.h ../include/ircd_relay.h \
   ../include/channel.h ../include/ircd_defs.h ../include/client.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
-  ../include/struct.h ../include/ircd_chattr.h ../include/ircd_reply.h \
-  ../include/ircd_string.h ../include/match.h ../include/msg.h \
-  ../include/numeric.h ../include/numnicks.h ../include/s_debug.h \
-  ../include/s_misc.h ../include/s_user.h ../include/send.h
+  ../include/struct.h ../include/ircd_chattr.h ../include/ircd_features.h \
+  ../include/ircd_reply.h ../include/ircd_string.h ../include/match.h \
+  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
+  ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \
+  ../include/send.h
 ircd_reply.o: ircd_reply.c ../config.h ../include/ircd_reply.h \
   ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
@@ -487,11 +490,12 @@ jupe.o: jupe.c ../config.h ../include/jupe.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
   ../include/ircd.h ../include/struct.h ../include/ircd_alloc.h \
-  ../include/ircd_log.h ../include/ircd_policy.h ../include/ircd_reply.h \
-  ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
-  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
-  ../include/s_bsd.h ../include/s_misc.h ../include/send.h \
-  ../include/support.h ../include/sys.h
+  ../include/ircd_features.h ../include/ircd_log.h \
+  ../include/ircd_reply.h ../include/ircd_string.h \
+  ../include/ircd_chattr.h ../include/match.h ../include/msg.h \
+  ../include/numeric.h ../include/numnicks.h ../include/s_bsd.h \
+  ../include/s_misc.h ../include/send.h ../include/support.h \
+  ../include/sys.h
 lex.yy.o: lex.yy.c ../include/ircd.h ../include/struct.h \
   ../include/ircd_defs.h y.tab.h
 list.o: list.c ../config.h ../include/list.h ../include/client.h \
@@ -511,7 +515,7 @@ listener.o: listener.c ../config.h ../include/listener.h \
   ../include/ircd_reply.h ../include/ircd_snprintf.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/numeric.h \
   ../include/s_bsd.h ../include/s_conf.h ../include/s_misc.h \
-  ../include/send.h ../include/sys.h
+  ../include/s_stats.h ../include/send.h ../include/sys.h
 m_account.o: m_account.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
@@ -521,9 +525,16 @@ m_account.o: m_account.c ../config.h ../include/client.h \
 m_admin.o: m_admin.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
-  ../include/ircd.h ../include/struct.h ../include/ircd_policy.h \
+  ../include/ircd.h ../include/struct.h ../include/ircd_features.h \
   ../include/ircd_reply.h ../include/msg.h ../include/numeric.h \
   ../include/numnicks.h ../include/s_conf.h ../include/s_user.h
+m_asll.o: m_asll.c ../config.h ../include/client.h ../include/ircd_defs.h \
+  ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
+  ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
+  ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
+  ../include/ircd_chattr.h ../include/numeric.h ../include/numnicks.h \
+  ../include/match.h ../include/msg.h ../include/send.h \
+  ../include/s_bsd.h ../include/s_user.h
 m_away.o: m_away.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
@@ -535,7 +546,7 @@ m_burst.o: m_burst.c ../config.h ../include/channel.h \
   ../include/ircd_defs.h ../include/client.h ../include/dbuf.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
   ../include/hash.h ../include/ircd.h ../include/struct.h \
-  ../include/ircd_alloc.h ../include/ircd_policy.h \
+  ../include/ircd_alloc.h ../include/ircd_features.h \
   ../include/ircd_reply.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/list.h ../include/match.h \
   ../include/msg.h ../include/numeric.h ../include/numnicks.h \
@@ -548,8 +559,8 @@ m_clearmode.o: m_clearmode.c ../config.h ../include/client.h \
   ../include/ircd_alloc.h ../include/ircd_features.h \
   ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/list.h ../include/msg.h \
-  ../include/numeric.h ../include/numnicks.h ../include/send.h \
-  ../include/support.h
+  ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \
+  ../include/send.h ../include/support.h
 m_close.o: m_close.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
@@ -685,7 +696,7 @@ m_kick.o: m_kick.c ../config.h ../include/channel.h \
 m_kill.o: m_kill.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
-  ../include/struct.h ../include/ircd_log.h ../include/ircd_policy.h \
+  ../include/struct.h ../include/ircd_features.h ../include/ircd_log.h \
   ../include/ircd_reply.h ../include/ircd_snprintf.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
   ../include/numeric.h ../include/numnicks.h ../include/s_misc.h \
@@ -693,7 +704,7 @@ m_kill.o: m_kill.c ../config.h ../include/client.h ../include/ircd_defs.h \
 m_links.o: m_links.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
-  ../include/struct.h ../include/ircd_policy.h ../include/ircd_reply.h \
+  ../include/struct.h ../include/ircd_features.h ../include/ircd_reply.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
   ../include/msg.h ../include/numeric.h ../include/numnicks.h \
   ../include/s_user.h ../include/send.h ../include/map.h
@@ -709,20 +720,19 @@ m_list.o: m_list.c ../config.h ../include/channel.h \
 m_lusers.o: m_lusers.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
-  ../include/struct.h ../include/ircd_policy.h ../include/ircd_reply.h \
+  ../include/struct.h ../include/ircd_features.h ../include/ircd_reply.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
   ../include/numeric.h ../include/numnicks.h ../include/querycmds.h \
-  ../include/ircd_features.h ../include/s_user.h ../include/s_serv.h \
-  ../include/send.h
+  ../include/s_user.h ../include/s_serv.h ../include/send.h
 m_map.o: m_map.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
-  ../include/ircd_policy.h ../include/ircd_reply.h \
+  ../include/ircd_features.h ../include/ircd_reply.h \
   ../include/ircd_snprintf.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/list.h ../include/match.h \
   ../include/msg.h ../include/numeric.h ../include/s_user.h \
   ../include/s_serv.h ../include/send.h ../include/querycmds.h \
-  ../include/ircd_features.h ../include/map.h
+  ../include/map.h
 m_mode.o: m_mode.c ../config.h ../include/handlers.h ../include/channel.h \
   ../include/ircd_defs.h ../include/client.h ../include/dbuf.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
@@ -734,7 +744,7 @@ m_mode.o: m_mode.c ../config.h ../include/handlers.h ../include/channel.h \
 m_motd.o: m_motd.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
-  ../include/ircd_policy.h ../include/ircd_reply.h \
+  ../include/ircd_features.h ../include/ircd_reply.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
   ../include/motd.h ../include/msg.h ../include/numeric.h \
   ../include/numnicks.h ../include/s_conf.h ../include/class.h \
@@ -750,8 +760,8 @@ m_nick.o: m_nick.c ../config.h ../include/IPcheck.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
   ../include/ircd.h ../include/struct.h ../include/ircd_chattr.h \
-  ../include/ircd_reply.h ../include/ircd_string.h \
-  ../include/ircd_policy.h ../include/msg.h ../include/numeric.h \
+  ../include/ircd_features.h ../include/ircd_reply.h \
+  ../include/ircd_string.h ../include/msg.h ../include/numeric.h \
   ../include/numnicks.h ../include/s_debug.h ../include/s_misc.h \
   ../include/s_user.h ../include/send.h
 m_notice.o: m_notice.c ../config.h ../include/client.h \
@@ -793,13 +803,15 @@ m_ping.o: m_ping.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/ircd_handler.h ../include/hash.h ../include/ircd_reply.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/ircd.h \
   ../include/struct.h ../include/msg.h ../include/numeric.h \
-  ../include/numnicks.h ../include/s_debug.h ../include/send.h
+  ../include/numnicks.h ../include/opercmds.h ../include/s_debug.h \
+  ../include/send.h
 m_pong.o: m_pong.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
   ../include/struct.h ../include/ircd_reply.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
-  ../include/numnicks.h ../include/s_user.h ../include/send.h
+  ../include/numnicks.h ../include/opercmds.h ../include/s_user.h \
+  ../include/send.h
 m_privmsg.o: m_privmsg.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
@@ -863,14 +875,13 @@ m_server.o: m_server.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
   ../include/ircd.h ../include/struct.h ../include/ircd_log.h \
-  ../include/ircd_policy.h ../include/ircd_features.h \
-  ../include/ircd_reply.h ../include/ircd_string.h \
-  ../include/ircd_chattr.h ../include/jupe.h ../include/list.h \
-  ../include/match.h ../include/msg.h ../include/numeric.h \
-  ../include/numnicks.h ../include/querycmds.h ../include/s_bsd.h \
-  ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
-  ../include/s_serv.h ../include/send.h ../include/userload.h \
-  ../include/map.h
+  ../include/ircd_features.h ../include/ircd_reply.h \
+  ../include/ircd_string.h ../include/ircd_chattr.h ../include/jupe.h \
+  ../include/list.h ../include/match.h ../include/msg.h \
+  ../include/numeric.h ../include/numnicks.h ../include/querycmds.h \
+  ../include/s_bsd.h ../include/s_conf.h ../include/s_debug.h \
+  ../include/s_misc.h ../include/s_serv.h ../include/send.h \
+  ../include/userload.h
 m_set.o: m_set.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
@@ -900,23 +911,17 @@ m_squit.o: m_squit.c ../config.h ../include/client.h \
   ../include/ircd_reply.h ../include/ircd_string.h ../include/numeric.h \
   ../include/numnicks.h ../include/match.h ../include/s_debug.h \
   ../include/s_misc.h ../include/s_user.h ../include/send.h
-m_stats.o: m_stats.c ../config.h ../include/handlers.h \
-  ../include/s_stats.h ../include/channel.h ../include/ircd_defs.h \
-  ../include/class.h ../include/client.h ../include/dbuf.h \
-  ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
-  ../include/gline.h ../include/hash.h ../include/ircd.h \
-  ../include/struct.h ../include/ircd_alloc.h ../include/ircd_chattr.h \
-  ../include/ircd_features.h ../include/ircd_policy.h \
-  ../include/ircd_reply.h ../include/ircd_string.h ../include/list.h \
-  ../include/listener.h ../include/match.h ../include/motd.h \
-  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
-  ../include/opercmds.h ../include/s_bsd.h ../include/s_conf.h \
-  ../include/s_debug.h ../include/s_misc.h ../include/s_serv.h \
-  ../include/s_user.h ../include/send.h ../include/userload.h
+m_stats.o: m_stats.c ../config.h ../include/client.h \
+  ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
+  ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
+  ../include/struct.h ../include/ircd_features.h ../include/ircd_reply.h \
+  ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
+  ../include/numeric.h ../include/s_stats.h ../include/s_user.h \
+  ../include/send.h
 m_time.o: m_time.c ../config.h ../include/client.h ../include/ircd_defs.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
-  ../include/ircd_policy.h ../include/ircd_reply.h \
+  ../include/ircd_features.h ../include/ircd_reply.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
   ../include/numeric.h ../include/numnicks.h ../include/s_misc.h \
   ../include/s_user.h ../include/send.h
@@ -930,11 +935,12 @@ m_topic.o: m_topic.c ../config.h ../include/channel.h \
 m_trace.o: m_trace.c ../config.h ../include/class.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
-  ../include/ircd.h ../include/struct.h ../include/ircd_reply.h \
-  ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
-  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
-  ../include/s_bsd.h ../include/s_conf.h ../include/s_user.h \
-  ../include/send.h ../include/version.h
+  ../include/ircd.h ../include/struct.h ../include/ircd_features.h \
+  ../include/ircd_reply.h ../include/ircd_string.h \
+  ../include/ircd_chattr.h ../include/match.h ../include/msg.h \
+  ../include/numeric.h ../include/numnicks.h ../include/s_bsd.h \
+  ../include/s_conf.h ../include/s_user.h ../include/send.h \
+  ../include/version.h
 m_uping.o: m_uping.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
@@ -966,12 +972,11 @@ m_version.o: m_version.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
   ../include/ircd.h ../include/struct.h ../include/ircd_features.h \
-  ../include/ircd_policy.h ../include/ircd_reply.h \
-  ../include/ircd_snprintf.h ../include/ircd_string.h \
-  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
-  ../include/numnicks.h ../include/s_debug.h ../include/s_user.h \
-  ../include/send.h ../include/supported.h ../include/channel.h \
-  ../include/version.h
+  ../include/ircd_reply.h ../include/ircd_snprintf.h \
+  ../include/ircd_string.h ../include/ircd_chattr.h ../include/msg.h \
+  ../include/numeric.h ../include/numnicks.h ../include/s_debug.h \
+  ../include/s_user.h ../include/send.h ../include/supported.h \
+  ../include/channel.h ../include/version.h
 m_wallchops.o: m_wallchops.c ../config.h ../include/channel.h \
   ../include/ircd_defs.h ../include/client.h ../include/dbuf.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
@@ -991,41 +996,51 @@ m_wallusers.o: m_wallusers.c ../config.h ../include/client.h \
   ../include/ircd_reply.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
   ../include/send.h
+m_wallvoices.o: m_wallvoices.c ../config.h ../include/channel.h \
+  ../include/ircd_defs.h ../include/client.h ../include/dbuf.h \
+  ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
+  ../include/hash.h ../include/ircd.h ../include/struct.h \
+  ../include/ircd_reply.h ../include/ircd_string.h \
+  ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
+  ../include/numnicks.h ../include/s_user.h ../include/send.h
 m_who.o: m_who.c ../config.h ../include/channel.h ../include/ircd_defs.h \
   ../include/client.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
   ../include/ircd.h ../include/struct.h ../include/ircd_chattr.h \
-  ../include/ircd_log.h ../include/ircd_policy.h ../include/ircd_reply.h \
-  ../include/ircd_string.h ../include/match.h ../include/numeric.h \
-  ../include/numnicks.h ../include/send.h ../include/support.h \
-  ../include/whocmds.h
+  ../include/ircd_features.h ../include/ircd_log.h \
+  ../include/ircd_reply.h ../include/ircd_string.h ../include/match.h \
+  ../include/numeric.h ../include/numnicks.h ../include/send.h \
+  ../include/support.h ../include/whocmds.h
 m_whois.o: m_whois.c ../config.h ../include/channel.h \
   ../include/ircd_defs.h ../include/client.h ../include/dbuf.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
   ../include/hash.h ../include/ircd.h ../include/struct.h \
-  ../include/ircd_policy.h ../include/ircd_reply.h \
+  ../include/ircd_features.h ../include/ircd_reply.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/match.h \
   ../include/msg.h ../include/numeric.h ../include/numnicks.h \
   ../include/s_user.h ../include/send.h ../include/whocmds.h
 m_whowas.o: m_whowas.c ../config.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
-  ../include/ircd.h ../include/struct.h ../include/ircd_policy.h \
+  ../include/ircd.h ../include/struct.h ../include/ircd_features.h \
   ../include/ircd_reply.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/msg.h ../include/numeric.h \
   ../include/numnicks.h ../include/s_user.h ../include/s_misc.h \
   ../include/send.h ../include/whowas.h
-map.o: map.c ../config.h ../include/client.h ../include/ircd_defs.h \
-  ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
-  ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
-  ../include/ircd_policy.h ../include/ircd_reply.h \
-  ../include/ircd_snprintf.h ../include/ircd_string.h \
-  ../include/ircd_chattr.h ../include/ircd_alloc.h ../include/hash.h \
-  ../include/list.h ../include/match.h ../include/msg.h \
-  ../include/numeric.h ../include/s_user.h ../include/s_serv.h \
-  ../include/send.h ../include/querycmds.h ../include/ircd_features.h \
-  ../include/map.h
+map.o: map.c ../config.h ../include/map.h ../include/ircd_defs.h \
+  ../include/client.h ../include/dbuf.h ../include/msgq.h \
+  ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \
+  ../include/struct.h ../include/ircd_reply.h ../include/ircd_snprintf.h \
+  ../include/ircd_string.h ../include/ircd_chattr.h \
+  ../include/ircd_alloc.h ../include/hash.h ../include/list.h \
+  ../include/match.h ../include/msg.h ../include/numeric.h \
+  ../include/s_user.h ../include/s_serv.h ../include/send.h \
+  ../include/querycmds.h ../include/ircd_features.h
 match.o: match.c ../config.h ../include/match.h ../include/ircd_chattr.h
+memdebug.o: memdebug.c ../include/ircd.h ../include/struct.h \
+  ../include/ircd_defs.h ../include/ircd_alloc.h ../include/client.h \
+  ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
+  ../config.h ../include/ircd_handler.h ../include/s_debug.h
 motd.o: motd.c ../config.h ../include/motd.h ../include/class.h \
   ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
@@ -1034,9 +1049,13 @@ motd.o: motd.c ../config.h ../include/motd.h ../include/class.h \
   ../include/ircd_reply.h ../include/ircd_string.h \
   ../include/ircd_chattr.h ../include/match.h ../include/msg.h \
   ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \
-  ../include/s_debug.h ../include/s_user.h ../include/send.h
+  ../include/s_debug.h ../include/s_user.h ../include/s_stats.h \
+  ../include/send.h
 msgq.o: msgq.c ../config.h ../include/msgq.h ../include/ircd_defs.h \
-  ../include/ircd_alloc.h ../include/ircd_snprintf.h ../include/s_debug.h
+  ../include/ircd.h ../include/struct.h ../include/ircd_alloc.h \
+  ../include/ircd_features.h ../include/ircd_reply.h \
+  ../include/ircd_snprintf.h ../include/numeric.h ../include/send.h \
+  ../include/s_debug.h ../include/s_stats.h
 numnicks.o: numnicks.c ../config.h ../include/numnicks.h \
   ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
@@ -1061,13 +1080,13 @@ parse.o: parse.c ../config.h ../include/parse.h ../include/client.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/channel.h \
   ../include/handlers.h ../include/hash.h ../include/ircd.h \
   ../include/struct.h ../include/ircd_alloc.h ../include/ircd_chattr.h \
-  ../include/ircd_features.h ../include/ircd_policy.h \
-  ../include/ircd_reply.h ../include/ircd_string.h ../include/msg.h \
-  ../include/numeric.h ../include/numnicks.h ../include/opercmds.h \
-  ../include/querycmds.h ../include/res.h ../include/s_bsd.h \
-  ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
-  ../include/s_numeric.h ../include/s_user.h ../include/send.h \
-  ../include/sys.h ../include/whocmds.h ../include/whowas.h
+  ../include/ircd_features.h ../include/ircd_reply.h \
+  ../include/ircd_string.h ../include/msg.h ../include/numeric.h \
+  ../include/numnicks.h ../include/opercmds.h ../include/querycmds.h \
+  ../include/res.h ../include/s_bsd.h ../include/s_conf.h \
+  ../include/s_debug.h ../include/s_misc.h ../include/s_numeric.h \
+  ../include/s_user.h ../include/send.h ../include/sys.h \
+  ../include/whocmds.h ../include/whowas.h
 querycmds.o: querycmds.c ../config.h ../include/querycmds.h \
   ../include/ircd_features.h
 random.o: random.c ../config.h ../include/random.h ../include/client.h \
@@ -1116,12 +1135,13 @@ s_conf.o: s_conf.c ../config.h ../include/s_conf.h ../include/client.h \
 s_debug.o: s_debug.c ../config.h ../include/s_debug.h \
   ../include/ircd_defs.h ../include/channel.h ../include/class.h \
   ../include/client.h ../include/dbuf.h ../include/msgq.h \
-  ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
-  ../include/ircd_alloc.h ../include/ircd_features.h \
+  ../include/ircd_events.h ../include/ircd_handler.h ../include/gline.h \
+  ../include/hash.h ../include/ircd_alloc.h ../include/ircd_features.h \
   ../include/ircd_log.h ../include/ircd_osdep.h ../include/ircd_reply.h \
-  ../include/ircd.h ../include/struct.h ../include/list.h \
-  ../include/numeric.h ../include/numnicks.h ../include/res.h \
-  ../include/s_bsd.h ../include/s_conf.h ../include/send.h \
+  ../include/ircd.h ../include/struct.h ../include/jupe.h \
+  ../include/list.h ../include/motd.h ../include/numeric.h \
+  ../include/numnicks.h ../include/res.h ../include/s_bsd.h \
+  ../include/s_conf.h ../include/s_stats.h ../include/send.h \
   ../include/sys.h ../include/whowas.h
 s_err.o: s_err.c ../config.h ../include/numeric.h ../include/s_debug.h \
   ../include/ircd_defs.h
@@ -1129,22 +1149,22 @@ s_misc.o: s_misc.c ../config.h ../include/s_misc.h ../include/IPcheck.h \
   ../include/channel.h ../include/ircd_defs.h ../include/client.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
-  ../include/struct.h ../include/ircd_alloc.h ../include/ircd_log.h \
-  ../include/ircd_policy.h ../include/ircd_reply.h \
+  ../include/struct.h ../include/ircd_alloc.h ../include/ircd_features.h \
+  ../include/ircd_log.h ../include/ircd_reply.h \
   ../include/ircd_snprintf.h ../include/ircd_string.h \
-  ../include/ircd_chattr.h ../include/list.h ../include/match.h \
-  ../include/msg.h ../include/numeric.h ../include/numnicks.h \
-  ../include/parse.h ../include/querycmds.h ../include/ircd_features.h \
+  ../include/ircd_chattr.h ../include/list.h ../include/map.h \
+  ../include/match.h ../include/msg.h ../include/numeric.h \
+  ../include/numnicks.h ../include/parse.h ../include/querycmds.h \
   ../include/res.h ../include/s_bsd.h ../include/s_conf.h \
-  ../include/s_debug.h ../include/s_user.h ../include/send.h \
-  ../include/support.h ../include/sys.h ../include/uping.h \
-  ../include/userload.h ../include/map.h
+  ../include/s_debug.h ../include/s_stats.h ../include/s_user.h \
+  ../include/send.h ../include/support.h ../include/sys.h \
+  ../include/uping.h ../include/userload.h
 s_numeric.o: s_numeric.c ../config.h ../include/s_numeric.h \
   ../include/channel.h ../include/ircd_defs.h ../include/client.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
-  ../include/struct.h ../include/ircd_policy.h ../include/ircd_snprintf.h \
-  ../include/numnicks.h ../include/send.h
+  ../include/struct.h ../include/ircd_features.h \
+  ../include/ircd_snprintf.h ../include/numnicks.h ../include/send.h
 s_serv.o: s_serv.c ../config.h ../include/s_serv.h ../include/IPcheck.h \
   ../include/channel.h ../include/ircd_defs.h ../include/client.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
@@ -1158,21 +1178,24 @@ s_serv.o: s_serv.c ../config.h ../include/s_serv.h ../include/IPcheck.h \
   ../include/ircd_features.h ../include/s_bsd.h ../include/s_conf.h \
   ../include/s_debug.h ../include/s_misc.h ../include/s_user.h \
   ../include/send.h ../include/sys.h ../include/userload.h
-s_stats.o: s_stats.c ../config.h ../include/s_stats.h ../include/class.h \
-  ../include/client.h ../include/ircd_defs.h ../include/dbuf.h \
-  ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
+s_stats.o: s_stats.c ../config.h ../include/class.h ../include/client.h \
+  ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
+  ../include/ircd_events.h ../include/ircd_handler.h ../include/gline.h \
   ../include/ircd.h ../include/struct.h ../include/ircd_chattr.h \
-  ../include/ircd_log.h ../include/ircd_reply.h ../include/ircd_string.h \
-  ../include/listener.h ../include/match.h ../include/msg.h \
-  ../include/numeric.h ../include/numnicks.h ../include/s_conf.h \
-  ../include/s_user.h ../include/send.h
+  ../include/ircd_features.h ../include/ircd_log.h \
+  ../include/ircd_reply.h ../include/ircd_string.h ../include/listener.h \
+  ../include/list.h ../include/match.h ../include/motd.h ../include/msg.h \
+  ../include/numeric.h ../include/numnicks.h ../include/s_bsd.h \
+  ../include/s_conf.h ../include/s_debug.h ../include/s_misc.h \
+  ../include/s_serv.h ../include/s_stats.h ../include/s_user.h \
+  ../include/send.h ../include/userload.h
 s_user.o: s_user.c ../config.h ../include/s_user.h ../include/IPcheck.h \
   ../include/channel.h ../include/ircd_defs.h ../include/class.h \
   ../include/client.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/hash.h \
   ../include/ircd.h ../include/struct.h ../include/ircd_alloc.h \
   ../include/ircd_chattr.h ../include/ircd_features.h \
-  ../include/ircd_log.h ../include/ircd_policy.h ../include/ircd_reply.h \
+  ../include/ircd_log.h ../include/ircd_reply.h \
   ../include/ircd_snprintf.h ../include/ircd_string.h ../include/list.h \
   ../include/match.h ../include/motd.h ../include/msg.h \
   ../include/numeric.h ../include/numnicks.h ../include/parse.h \
@@ -1185,7 +1208,7 @@ send.o: send.c ../config.h ../include/send.h ../include/channel.h \
   ../include/ircd_defs.h ../include/class.h ../include/client.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/ircd.h ../include/struct.h \
-  ../include/ircd_policy.h ../include/ircd_snprintf.h \
+  ../include/ircd_features.h ../include/ircd_snprintf.h \
   ../include/ircd_string.h ../include/ircd_chattr.h ../include/list.h \
   ../include/match.h ../include/msg.h ../include/numnicks.h \
   ../include/parse.h ../include/s_bsd.h ../include/s_debug.h \
@@ -1208,20 +1231,20 @@ userload.o: userload.c ../config.h ../include/userload.h \
   ../include/msgq.h ../include/ircd_events.h ../include/ircd_handler.h \
   ../include/ircd.h ../include/struct.h ../include/msg.h \
   ../include/numnicks.h ../include/querycmds.h ../include/ircd_features.h \
-  ../include/s_misc.h ../include/send.h ../include/sys.h
+  ../include/s_misc.h ../include/s_stats.h ../include/send.h \
+  ../include/sys.h
 whocmds.o: whocmds.c ../config.h ../include/whocmds.h \
   ../include/channel.h ../include/ircd_defs.h ../include/client.h \
   ../include/dbuf.h ../include/msgq.h ../include/ircd_events.h \
   ../include/ircd_handler.h ../include/hash.h ../include/ircd.h \
-  ../include/struct.h ../include/ircd_chattr.h ../include/ircd_policy.h \
+  ../include/struct.h ../include/ircd_chattr.h ../include/ircd_features.h \
   ../include/ircd_reply.h ../include/ircd_snprintf.h \
   ../include/ircd_string.h ../include/list.h ../include/match.h \
   ../include/numeric.h ../include/numnicks.h ../include/querycmds.h \
-  ../include/ircd_features.h ../include/random.h ../include/s_bsd.h \
-  ../include/s_conf.h ../include/s_misc.h ../include/s_user.h \
-  ../include/send.h ../include/support.h ../include/sys.h \
-  ../include/userload.h ../include/version.h ../include/whowas.h \
-  ../include/msg.h
+  ../include/random.h ../include/s_bsd.h ../include/s_conf.h \
+  ../include/s_misc.h ../include/s_user.h ../include/send.h \
+  ../include/support.h ../include/sys.h ../include/userload.h \
+  ../include/version.h ../include/whowas.h ../include/msg.h
 whowas.o: whowas.c ../config.h ../include/whowas.h ../include/client.h \
   ../include/ircd_defs.h ../include/dbuf.h ../include/msgq.h \
   ../include/ircd_events.h ../include/ircd_handler.h ../include/ircd.h \

diff --git a/ircd/map.c b/ircd/map.c
index 0a67438763d3304bc66314aecaffc42a6871107e..52d68388041fe33014172c0d3fe384144c871735 100644 (file)
--- a/ircd/map.c
+++ b/ircd/map.c
@@ -26,10 +26,10 @@
 
 #include "config.h"
 
+#include "map.h"
 #include "client.h"
 #include "ircd.h"
 #include "ircd_defs.h"
-#include "ircd_policy.h"
 #include "ircd_reply.h"
 #include "ircd_snprintf.h"
 #include "ircd_string.h"
@@ -43,14 +43,11 @@
 #include "s_serv.h"
 #include "send.h"
 #include "querycmds.h"
-#include "map.h"
 
 #include <assert.h>
 #include <stdio.h>
 #include <string.h>
 
-#if defined(HEAD_IN_SAND_MAP) || defined(HEAD_IN_SAND_LINKS)
-
 static struct Map *MapList = 0;
 
 /* Add a server to the map list. */
@@ -133,7 +130,6 @@ void map_update(struct Client *cptr)
   if(!map)
     map_add(cptr);
 }
-#endif /* HEAD_IN_SAND_MAP || HEAD_IN_SAND_LINKS*/ 
 
 #ifdef HEAD_IN_SAND_MAP