diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-17 16:08:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2017-11-17 16:08:49 (GMT) |
| commit | 2ea8f0fe98ed8a2f72d7d355b9c080fbb5bdd912 (patch) | |
| tree | 72a43aee97b77bd843b0375f98b3f87a8c2bd176 /generic/tclStringObj.c | |
| parent | b832920adb6043bec1ec4081a84481bad38cc3ac (diff) | |
| download | tcl-2ea8f0fe98ed8a2f72d7d355b9c080fbb5bdd912.zip tcl-2ea8f0fe98ed8a2f72d7d355b9c080fbb5bdd912.tar.gz tcl-2ea8f0fe98ed8a2f72d7d355b9c080fbb5bdd912.tar.bz2 | |
merge core-8-branch. Fix some Tcl_UniChar initialization, in case TCL_UTF_MAX == 4
Diffstat (limited to 'generic/tclStringObj.c')
| -rw-r--r-- | generic/tclStringObj.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 1ccd778..fda6ac1 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -1869,20 +1869,20 @@ Tcl_AppendFormatToObj( } else if (ch == 'I') { if ((format[1] == '6') && (format[2] == '4')) { format += (step + 2); - step = Tcl_UtfToUniChar(format, &ch); + step = TclUtfToUniChar(format, &ch); #ifndef TCL_WIDE_INT_IS_LONG useWide = 1; #endif } else if ((format[1] == '3') && (format[2] == '2')) { format += (step + 2); - step = Tcl_UtfToUniChar(format, &ch); + step = TclUtfToUniChar(format, &ch); } else { format += step; - step = Tcl_UtfToUniChar(format, &ch); + step = TclUtfToUniChar(format, &ch); } } else if ((ch == 't') || (ch == 'z')) { format += step; - step = Tcl_UtfToUniChar(format, &ch); + step = TclUtfToUniChar(format, &ch); #ifndef TCL_WIDE_INT_IS_LONG if (sizeof(size_t) > sizeof(int)) { useWide = 1; @@ -1890,7 +1890,7 @@ Tcl_AppendFormatToObj( #endif } else if ((ch == 'q') ||(ch == 'j')) { format += step; - step = Tcl_UtfToUniChar(format, &ch); + step = TclUtfToUniChar(format, &ch); #ifndef TCL_WIDE_INT_IS_LONG useWide = 1; #endif |