diff options
49 files changed, 6 insertions, 271 deletions
@@ -879,7 +879,7 @@ sub dir_check { sub getosflags { if ($config{OSNAME} =~ /BSD$/) { $config{LDLIBS} = "-Ldl -lstdc++"; - $config{FLAGS} = "-fPIC -frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}"; + $config{FLAGS} = "-fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}"; $config{MAKEPROG} = "gmake"; if ($config{OSNAME} eq "OpenBSD") { chomp($foo = `eg++ -dumpversion | cut -c 1`); @@ -893,15 +893,15 @@ sub getosflags { } } else { $config{LDLIBS} = "-ldl -lstdc++"; - $config{FLAGS} = "-fPIC -frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}"; + $config{FLAGS} = "-fPIC -Wall -Woverloaded-virtual $config{OPTIMISATI}"; $config{MAKEPROG} = "make"; if ($config{OSNAME} =~ /CYGWIN/) { - $config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}"; + $config{FLAGS} = "-Wall -Woverloaded-virtual $config{OPTIMISATI}"; $config{LDLIBS} = ""; $config{MAKEPROG} = "/usr/bin/make"; $config{MAKEORDER} = "ircd mods"; } elsif ($config{OSNAME} eq "CYG-STATIC") { - $config{FLAGS} = "-frtti -Wall -Woverloaded-virtual $config{OPTIMISATI}"; + $config{FLAGS} = "-Wall -Woverloaded-virtual $config{OPTIMISATI}"; $config{LDLIBS} = ""; $config{MAKEPROG} = "/usr/bin/make"; $config{MAKEORDER} = "mods ircd"; diff --git a/include/command_parse.h b/include/command_parse.h index ca12ff1a1..908add7dd 100644 --- a/include/command_parse.h +++ b/include/command_parse.h @@ -17,8 +17,6 @@ #ifndef __COMMAND_PARSE_H #define __COMMAND_PARSE_H -#include <typeinfo> -#include <iostream> #include <string> #include "users.h" #include "ctables.h" diff --git a/include/commands/cmd_away.h b/include/commands/cmd_away.h index 52257bab1..3f9eddb87 100644 --- a/include/commands/cmd_away.h +++ b/include/commands/cmd_away.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_commands.h b/include/commands/cmd_commands.h index 031dec606..2f9c5f4cb 100644 --- a/include/commands/cmd_commands.h +++ b/include/commands/cmd_commands.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_die.h b/include/commands/cmd_die.h index cd05c480e..e2b8099a2 100644 --- a/include/commands/cmd_die.h +++ b/include/commands/cmd_die.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_eline.h b/include/commands/cmd_eline.h index 23cba4964..03a1a7df8 100644 --- a/include/commands/cmd_eline.h +++ b/include/commands/cmd_eline.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_gline.h b/include/commands/cmd_gline.h index 622661e87..726933576 100644 --- a/include/commands/cmd_gline.h +++ b/include/commands/cmd_gline.h @@ -17,14 +17,8 @@ #ifndef __CMD_GLINE_H__ #define __CMD_GLINE_H__ -// include the common header files +// include the common header file -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_info.h b/include/commands/cmd_info.h index bcf12c146..368f1efbd 100644 --- a/include/commands/cmd_info.h +++ b/include/commands/cmd_info.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_invite.h b/include/commands/cmd_invite.h index 88a0f180b..9b68d2239 100644 --- a/include/commands/cmd_invite.h +++ b/include/commands/cmd_invite.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_ison.h b/include/commands/cmd_ison.h index 0bc5da408..567f8e608 100644 --- a/include/commands/cmd_ison.h +++ b/include/commands/cmd_ison.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_join.h b/include/commands/cmd_join.h index 4ead0e80e..c57268cd6 100644 --- a/include/commands/cmd_join.h +++ b/include/commands/cmd_join.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_kick.h b/include/commands/cmd_kick.h index e57f9f78c..356338b24 100644 --- a/include/commands/cmd_kick.h +++ b/include/commands/cmd_kick.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_kill.h b/include/commands/cmd_kill.h index 0bf7517f6..a2f361a95 100644 --- a/include/commands/cmd_kill.h +++ b/include/commands/cmd_kill.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_kline.h b/include/commands/cmd_kline.h index 86521484a..7e79f1021 100644 --- a/include/commands/cmd_kline.h +++ b/include/commands/cmd_kline.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_links.h b/include/commands/cmd_links.h index 284728aee..89ee7e15c 100644 --- a/include/commands/cmd_links.h +++ b/include/commands/cmd_links.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_list.h b/include/commands/cmd_list.h index af7d6d774..be24b87c7 100644 --- a/include/commands/cmd_list.h +++ b/include/commands/cmd_list.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_loadmodule.h b/include/commands/cmd_loadmodule.h index 4e86058ce..c82560653 100644 --- a/include/commands/cmd_loadmodule.h +++ b/include/commands/cmd_loadmodule.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_lusers.h b/include/commands/cmd_lusers.h index 3600cb8e9..ab3c2f601 100644 --- a/include/commands/cmd_lusers.h +++ b/include/commands/cmd_lusers.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_map.h b/include/commands/cmd_map.h index c472bada4..4a06b3069 100644 --- a/include/commands/cmd_map.h +++ b/include/commands/cmd_map.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_modules.h b/include/commands/cmd_modules.h index 75b24d108..537f510f5 100644 --- a/include/commands/cmd_modules.h +++ b/include/commands/cmd_modules.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_names.h b/include/commands/cmd_names.h index 1ec8e811c..c3e87e324 100644 --- a/include/commands/cmd_names.h +++ b/include/commands/cmd_names.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_nick.h b/include/commands/cmd_nick.h index ee9195f0b..1924ce1e8 100644 --- a/include/commands/cmd_nick.h +++ b/include/commands/cmd_nick.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_notice.h b/include/commands/cmd_notice.h index 19fbc3365..24aa773c1 100644 --- a/include/commands/cmd_notice.h +++ b/include/commands/cmd_notice.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_oper.h b/include/commands/cmd_oper.h index afb10e3cb..cfbdb8815 100644 --- a/include/commands/cmd_oper.h +++ b/include/commands/cmd_oper.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_part.h b/include/commands/cmd_part.h index 59af15a87..60e7911d1 100644 --- a/include/commands/cmd_part.h +++ b/include/commands/cmd_part.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_ping.h b/include/commands/cmd_ping.h index 7afabc816..2ad2aca68 100644 --- a/include/commands/cmd_ping.h +++ b/include/commands/cmd_ping.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_pong.h b/include/commands/cmd_pong.h index 2399603e7..d89b3b877 100644 --- a/include/commands/cmd_pong.h +++ b/include/commands/cmd_pong.h @@ -19,8 +19,6 @@ // include the common header files -#include <string> -#include <vector> #include "inspircd.h" #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_privmsg.h b/include/commands/cmd_privmsg.h index 8ed0bbe8d..c50d826d2 100644 --- a/include/commands/cmd_privmsg.h +++ b/include/commands/cmd_privmsg.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_qline.h b/include/commands/cmd_qline.h index 365561929..e6468b4eb 100644 --- a/include/commands/cmd_qline.h +++ b/include/commands/cmd_qline.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_quit.h b/include/commands/cmd_quit.h index 937836e81..9d11538df 100644 --- a/include/commands/cmd_quit.h +++ b/include/commands/cmd_quit.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_rehash.h b/include/commands/cmd_rehash.h index cb2d2e666..f410f37b1 100644 --- a/include/commands/cmd_rehash.h +++ b/include/commands/cmd_rehash.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_server.h b/include/commands/cmd_server.h index 548c361a8..181e53af2 100644 --- a/include/commands/cmd_server.h +++ b/include/commands/cmd_server.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_stats.h b/include/commands/cmd_stats.h index 74cf86d4c..591b3e755 100644 --- a/include/commands/cmd_stats.h +++ b/include/commands/cmd_stats.h @@ -19,12 +19,7 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> +#include "inspircd.h" #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_time.h b/include/commands/cmd_time.h index 506bb8527..a75747a6e 100644 --- a/include/commands/cmd_time.h +++ b/include/commands/cmd_time.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_topic.h b/include/commands/cmd_topic.h index 6475adb43..3b3f7090c 100644 --- a/include/commands/cmd_topic.h +++ b/include/commands/cmd_topic.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_trace.h b/include/commands/cmd_trace.h index 84ea8b6c3..8fe3b166a 100644 --- a/include/commands/cmd_trace.h +++ b/include/commands/cmd_trace.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_unloadmodule.h b/include/commands/cmd_unloadmodule.h index 222464525..0104d04b1 100644 --- a/include/commands/cmd_unloadmodule.h +++ b/include/commands/cmd_unloadmodule.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_user.h b/include/commands/cmd_user.h index f529f6108..919078193 100644 --- a/include/commands/cmd_user.h +++ b/include/commands/cmd_user.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_userhost.h b/include/commands/cmd_userhost.h index f065b468c..83ae27678 100644 --- a/include/commands/cmd_userhost.h +++ b/include/commands/cmd_userhost.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_version.h b/include/commands/cmd_version.h index 478577a68..6a77725c1 100644 --- a/include/commands/cmd_version.h +++ b/include/commands/cmd_version.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_wallops.h b/include/commands/cmd_wallops.h index c637e6e98..819fa121e 100644 --- a/include/commands/cmd_wallops.h +++ b/include/commands/cmd_wallops.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_who.h b/include/commands/cmd_who.h index 1181ac0e1..fff9737ad 100644 --- a/include/commands/cmd_who.h +++ b/include/commands/cmd_who.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_whois.h b/include/commands/cmd_whois.h index 962444a82..26e2e52c3 100644 --- a/include/commands/cmd_whois.h +++ b/include/commands/cmd_whois.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_whowas.h b/include/commands/cmd_whowas.h index 951ba0f28..1664a847d 100644 --- a/include/commands/cmd_whowas.h +++ b/include/commands/cmd_whowas.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/commands/cmd_zline.h b/include/commands/cmd_zline.h index 0e2f1041d..eefd3c642 100644 --- a/include/commands/cmd_zline.h +++ b/include/commands/cmd_zline.h @@ -19,12 +19,6 @@ // include the common header files -#include <typeinfo> -#include <iostream> -#include <string> -#include <deque> -#include <sstream> -#include <vector> #include "users.h" #include "channels.h" diff --git a/include/cull_list.h b/include/cull_list.h index 96d5a83c5..e20e4556a 100644 --- a/include/cull_list.h +++ b/include/cull_list.h @@ -19,11 +19,8 @@ // include the common header files -#include <typeinfo> -#include <iostream> #include <string> #include <deque> -#include <sstream> #include <vector> #include "users.h" #include "channels.h" diff --git a/include/mode.h b/include/mode.h index 4cdab2884..0b85a0bac 100644 --- a/include/mode.h +++ b/include/mode.h @@ -18,11 +18,8 @@ #define __MODE_H /* include the common header files */ -#include <typeinfo> -#include <iostream> #include <string> #include <deque> -#include <sstream> #include <vector> #include "users.h" #include "channels.h" diff --git a/include/modules.h b/include/modules.h index f80960f6f..2754a42c2 100644 --- a/include/modules.h +++ b/include/modules.h @@ -64,7 +64,6 @@ enum TargetTypeFlags { #include <string> #include <deque> #include <sstream> -#include <typeinfo> #include "timer.h" #include "mode.h" #include "dns.h" diff --git a/include/xline.h b/include/xline.h index 9c42a32e5..26a3acf87 100644 --- a/include/xline.h +++ b/include/xline.h @@ -19,11 +19,8 @@ // include the common header files -#include <typeinfo> -#include <iostream> #include <string> #include <deque> -#include <sstream> #include <vector> #include "users.h" #include "channels.h" |