summaryrefslogtreecommitdiffstats
path: root/generic/tclMain.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-02-21 08:52:54 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-02-21 08:52:54 (GMT)
commit5c1a56d36b45b4032778ee7f972181673a3a5ff0 (patch)
tree668427e000ea020a58f9714c6988f14b3edfadb4 /generic/tclMain.c
parent73cc9cd62f844146e1d9a835511da3b641aafac0 (diff)
parent1fb8e115c4cd0dc9a351e7a6e183f8956996117d (diff)
downloadtcl-5c1a56d36b45b4032778ee7f972181673a3a5ff0.zip
tcl-5c1a56d36b45b4032778ee7f972181673a3a5ff0.tar.gz
tcl-5c1a56d36b45b4032778ee7f972181673a3a5ff0.tar.bz2
Merge 8.6
Diffstat (limited to 'generic/tclMain.c')
-rw-r--r--generic/tclMain.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclMain.c b/generic/tclMain.c
index 0ed5de1..7f13ebf 100644
--- a/generic/tclMain.c
+++ b/generic/tclMain.c
@@ -118,7 +118,7 @@ static void Prompt(Tcl_Interp *interp, InteractiveState *isPtr);
static void StdinProc(ClientData clientData, int mask);
static void FreeMainInterp(ClientData clientData);
-#if !defined(_WIN32) || defined(UNICODE)
+#if !defined(_WIN32) || defined(UNICODE) && !defined(TCL_ASCII_MAIN)
static Tcl_ThreadDataKey dataKey;
/*