From 863263aa077f12c777b67b30053bc31a8f9a8b39 Mon Sep 17 00:00:00 2001 From: Kevin Easton Date: Mon, 27 Nov 2017 23:15:06 +1100 Subject: [PATCH] Make inclusion of tcl_bx.h unconditional There's no need for the conditional compilation - tcl_bx.h itself has the WANT_TCL guards necessary. This makes generating the Makefile target dependencies easier. --- source/Makefile.in | 5 +++-- source/ctcp.c | 3 --- source/hook.c | 2 -- source/tcl.c | 3 +-- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/source/Makefile.in b/source/Makefile.in index 981ba0a..736a5ae 100644 --- a/source/Makefile.in +++ b/source/Makefile.in @@ -410,7 +410,8 @@ commands.o: commands.c ../include/irc.h ../include/defs.h \ ../include/list.h ../include/userlist.h ../include/misc.h \ ../include/alist.h ../include/tcl_bx.h ../include/hash2.h \ ../include/whowas.h ../include/cset.h ../include/notice.h \ - ../include/translat.h ../include/modval.h ../include/module.h + ../include/module.h ../include/translat.h ../include/modval.h \ + ../include/module.h compat.o: compat.c ../include/irc_std.h ../include/defs.h cset.o: cset.c ../include/irc.h ../include/defs.h ../include/config.h \ ../include/../.config.h ../include/bsdglob.h ../include/irc_std.h \ @@ -997,7 +998,7 @@ tcl.o: tcl.c ../include/irc.h ../include/defs.h ../include/config.h \ ../include/alias.h ../include/queue.h ../include/timer.h \ ../include/list.h ../include/userlist.h ../include/misc.h \ ../include/whowas.h ../include/hash2.h ../include/whowas.h \ - ../include/modval.h ../include/module.h ../include/tcl_bx.h + ../include/tcl_bx.h ../include/modval.h ../include/module.h tcl_public.o: tcl_public.c ../include/irc.h ../include/defs.h \ ../include/config.h ../include/../.config.h ../include/bsdglob.h \ ../include/irc_std.h ../include/debug.h ../include/newio.h \ diff --git a/source/ctcp.c b/source/ctcp.c index f6a6109..7b188a0 100644 --- a/source/ctcp.c +++ b/source/ctcp.c @@ -45,10 +45,7 @@ CVS_REVISION(ctcp_c) #include "misc.h" #include "userlist.h" #include "hash2.h" - -#ifdef WANT_TCL #include "tcl_bx.h" -#endif #define MAIN_SOURCE #include "modval.h" diff --git a/source/hook.c b/source/hook.c index acce07a..bbcb617 100644 --- a/source/hook.c +++ b/source/hook.c @@ -26,9 +26,7 @@ CVS_REVISION(hook_c) #include "parse.h" #include "misc.h" #include "stack.h" -#ifdef WANT_TCL #include "tcl_bx.h" -#endif #define MAIN_SOURCE #include "modval.h" diff --git a/source/tcl.c b/source/tcl.c index 1ee31bd..c8773ec 100644 --- a/source/tcl.c +++ b/source/tcl.c @@ -43,6 +43,7 @@ #include "who.h" #include "whowas.h" #include "hash2.h" +#include "tcl_bx.h" #define MAIN_SOURCE #include "modval.h" @@ -50,8 +51,6 @@ char tcl_versionstr[] = "Tcl 2.1"; #ifdef WANT_TCL -/*#define TCL_PLUS*/ -#include "tcl_bx.h" Tcl_HashTable *gethashtable (int, int *, char *);