summaryrefslogtreecommitdiffstats
path: root/generic/tclBasic.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2018-05-17 19:05:37 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2018-05-17 19:05:37 (GMT)
commit37c4a581adba19a71bdc30897e11a4be2d24b2ce (patch)
tree9e1c46e9cd0b8c0e41b8d692d4527228a718e7c0 /generic/tclBasic.c
parentcfd3e7533755f50f92a64c9a5b637b52f30ae3ee (diff)
parent4f1ea4779be85d8837f3a133b52d3b5aa9e53fda (diff)
downloadtcl-37c4a581adba19a71bdc30897e11a4be2d24b2ce.zip
tcl-37c4a581adba19a71bdc30897e11a4be2d24b2ce.tar.gz
tcl-37c4a581adba19a71bdc30897e11a4be2d24b2ce.tar.bz2
Merge 8.7, but keep TCL_THREADS undefined in tcl.h (since that's no longer necessary)
Diffstat (limited to 'generic/tclBasic.c')
-rw-r--r--generic/tclBasic.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclBasic.c b/generic/tclBasic.c
index 46f3b6e..14f7132 100644
--- a/generic/tclBasic.c
+++ b/generic/tclBasic.c
@@ -713,7 +713,7 @@ Tcl_CreateInterp(void)
* cache was already initialised by the call to alloc the interp struct.
*/
-#if defined(TCL_THREADS) && defined(USE_THREAD_ALLOC)
+#if (!defined(TCL_THREADS) || TCL_THREADS) && defined(USE_THREAD_ALLOC)
iPtr->allocCache = TclpGetAllocCache();
#else
iPtr->allocCache = NULL;
@@ -923,7 +923,7 @@ Tcl_CreateInterp(void)
Tcl_SetVar2(interp, "tcl_version", NULL, TCL_VERSION, TCL_GLOBAL_ONLY);
TclpSetVariables(interp);
-#ifdef TCL_THREADS
+#if !defined(TCL_THREADS) || TCL_THREADS
/*
* The existence of the "threaded" element of the tcl_platform array
* indicates that this particular Tcl shell has been compiled with threads