diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-11 10:03:18 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-11 10:03:18 (GMT) |
| commit | 7475433fc2d4d5df9d885664d8c7f430d61e7c84 (patch) | |
| tree | f0ce649ff6c20ba0f4150fb0d9d10fdd8def247c /generic/tclTimer.c | |
| parent | 8229cd730444707ecef238b9678a5c8d779554f0 (diff) | |
| parent | 089b9970444fbf3410572b30650c80fc75bdda82 (diff) | |
| download | tcl-7475433fc2d4d5df9d885664d8c7f430d61e7c84.zip tcl-7475433fc2d4d5df9d885664d8c7f430d61e7c84.tar.gz tcl-7475433fc2d4d5df9d885664d8c7f430d61e7c84.tar.bz2 | |
Merge 8.7, resolve conflicts
Diffstat (limited to 'generic/tclTimer.c')
| -rw-r--r-- | generic/tclTimer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclTimer.c b/generic/tclTimer.c index ede233a..eff2f8a 100644 --- a/generic/tclTimer.c +++ b/generic/tclTimer.c @@ -893,10 +893,10 @@ Tcl_AfterObjCmd( } else { commandPtr = Tcl_ConcatObj(objc-2, objv+2); } - command = TclGetStringFromObj(commandPtr, &length); + command = Tcl_GetStringFromObj(commandPtr, &length); for (afterPtr = assocPtr->firstAfterPtr; afterPtr != NULL; afterPtr = afterPtr->nextPtr) { - tempCommand = TclGetStringFromObj(afterPtr->commandPtr, + tempCommand = Tcl_GetStringFromObj(afterPtr->commandPtr, &tempLength); if ((length == tempLength) && !memcmp(command, tempCommand, length)) { |