summaryrefslogtreecommitdiffstats
path: root/generic/tclMain.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2020-02-21 08:55:02 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2020-02-21 08:55:02 (GMT)
commit2cce06805f7f8960bc059c1fc206071a2ad1491a (patch)
tree36562cef50ed1984baad25f59e78c1b8b02f56b1 /generic/tclMain.c
parent30c32418f67d6455d36bfeb1b8b4539ca5f23771 (diff)
parent5c1a56d36b45b4032778ee7f972181673a3a5ff0 (diff)
downloadtcl-2cce06805f7f8960bc059c1fc206071a2ad1491a.zip
tcl-2cce06805f7f8960bc059c1fc206071a2ad1491a.tar.gz
tcl-2cce06805f7f8960bc059c1fc206071a2ad1491a.tar.bz2
Merge 8.7
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 8b1ee3e..84c0638 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;
/*