diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-20 10:30:02 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-20 10:30:02 (GMT) |
| commit | c19490026d441afb3bbe0b2d209da39655bf212e (patch) | |
| tree | 5f1ee3e02393980557cb128bed8cd7841401ae5f /generic/tclThreadTest.c | |
| parent | c2eeda3f09a8b05e10e5f8f968fc28bb2dcf3750 (diff) | |
| parent | bc3e198cba9e40c015a6acfa992c69434274dde6 (diff) | |
| download | tcl-c19490026d441afb3bbe0b2d209da39655bf212e.zip tcl-c19490026d441afb3bbe0b2d209da39655bf212e.tar.gz tcl-c19490026d441afb3bbe0b2d209da39655bf212e.tar.bz2 | |
Re-base to core-8-branch: This change is fine as-is for Tcl 8.7, I wouldn't recommend it for 8.6 (even though it's only for the changed error-message)
Diffstat (limited to 'generic/tclThreadTest.c')
| -rw-r--r-- | generic/tclThreadTest.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclThreadTest.c b/generic/tclThreadTest.c index fcf3880..9c5fecb 100644 --- a/generic/tclThreadTest.c +++ b/generic/tclThreadTest.c @@ -655,9 +655,9 @@ ThreadErrorProc( char *script; char buf[TCL_DOUBLE_SPACE+1]; - sprintf(buf, "%" TCL_LL_MODIFIER "d", (Tcl_WideInt)(size_t)Tcl_GetCurrentThread()); + sprintf(buf, "%p", Tcl_GetCurrentThread()); - errorInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY); + errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY); if (errorProcString == NULL) { errChannel = Tcl_GetStdChannel(TCL_STDERR); Tcl_WriteChars(errChannel, "Error from thread ", -1); @@ -1032,8 +1032,8 @@ ThreadEventProc( code = Tcl_EvalEx(interp, threadEventPtr->script,-1,TCL_EVAL_GLOBAL); Tcl_DeleteThreadExitHandler(ThreadFreeProc, threadEventPtr->script); if (code != TCL_OK) { - errorCode = Tcl_GetVar(interp, "errorCode", TCL_GLOBAL_ONLY); - errorInfo = Tcl_GetVar(interp, "errorInfo", TCL_GLOBAL_ONLY); + errorCode = Tcl_GetVar2(interp, "errorCode", NULL, TCL_GLOBAL_ONLY); + errorInfo = Tcl_GetVar2(interp, "errorInfo", NULL, TCL_GLOBAL_ONLY); } else { errorCode = errorInfo = NULL; } |