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/tclEncoding.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/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 7ded27e..1a19652 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -3699,7 +3699,7 @@ InitializeEncodingSearchPath( if (*encodingPtr) { ((Encoding *)(*encodingPtr))->refCount++; } - bytes = TclGetStringFromObj(searchPathObj, lengthPtr); + bytes = Tcl_GetStringFromObj(searchPathObj, lengthPtr); *valuePtr = (char *)Tcl_Alloc(*lengthPtr + 1); memcpy(*valuePtr, bytes, *lengthPtr + 1); Tcl_DecrRefCount(searchPathObj); |