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 /macosx | |
| 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 'macosx')
| -rw-r--r-- | macosx/tclMacOSXFCmd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/macosx/tclMacOSXFCmd.c b/macosx/tclMacOSXFCmd.c index d408218..b1961e9 100644 --- a/macosx/tclMacOSXFCmd.c +++ b/macosx/tclMacOSXFCmd.c @@ -641,7 +641,7 @@ SetOSTypeFromAny( Tcl_Encoding encoding = Tcl_GetEncoding(NULL, "macRoman"); size_t length; - string = TclGetStringFromObj(objPtr, &length); + string = Tcl_GetStringFromObj(objPtr, &length); Tcl_UtfToExternalDString(encoding, string, length, &ds); if (Tcl_DStringLength(&ds) > 4) { |