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/tclEncoding.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/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); |