diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-21 14:05:41 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-01-21 14:05:41 (GMT) |
| commit | 27665100ad52dd5d6b91df7e6717944b04645a69 (patch) | |
| tree | 5683214c1138991228778895a5e720dac4986e82 /generic/tclOptimize.c | |
| parent | b3877e5fef6cb8855887a6cfa8c36202b0412076 (diff) | |
| parent | 7475433fc2d4d5df9d885664d8c7f430d61e7c84 (diff) | |
| download | tcl-27665100ad52dd5d6b91df7e6717944b04645a69.zip tcl-27665100ad52dd5d6b91df7e6717944b04645a69.tar.gz tcl-27665100ad52dd5d6b91df7e6717944b04645a69.tar.bz2 | |
Merge TIP 481 (resolve conflicts)
Diffstat (limited to 'generic/tclOptimize.c')
| -rw-r--r-- | generic/tclOptimize.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclOptimize.c b/generic/tclOptimize.c index 6d5b09b..fef6c26 100644 --- a/generic/tclOptimize.c +++ b/generic/tclOptimize.c @@ -233,7 +233,7 @@ ConvertZeroEffectToNOP( TclGetUInt1AtPtr(currentInstPtr + 1)); size_t numBytes; - (void) TclGetStringFromObj(litPtr, &numBytes); + (void) Tcl_GetStringFromObj(litPtr, &numBytes); if (numBytes == 0) { blank = size + InstLength(nextInst); } @@ -248,7 +248,7 @@ ConvertZeroEffectToNOP( TclGetUInt4AtPtr(currentInstPtr + 1)); size_t numBytes; - (void) TclGetStringFromObj(litPtr, &numBytes); + (void) Tcl_GetStringFromObj(litPtr, &numBytes); if (numBytes == 0) { blank = size + InstLength(nextInst); } |