summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--generic/tclScan.c9
1 files changed, 1 insertions, 8 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c
index 4b9298d..c599797 100644
--- a/generic/tclScan.c
+++ b/generic/tclScan.c
@@ -881,14 +881,7 @@ Tcl_ScanObjCmd(
* Scan a single Unicode character.
*/
- offset = TclUtfToUniChar(string, &sch);
- i = (int)sch;
-#if TCL_UTF_MAX == 4
- if ((sch >= 0xD800) && (offset < 3)) {
- offset += TclUtfToUniChar(string+offset, &sch);
- i = (((i<<10) & 0x0FFC00) + 0x10000) + (sch & 0x3FF);
- }
-#endif
+ offset = TclUtfToUCS4(string, &i);
string += offset;
if (!(flags & SCAN_SUPPRESS)) {
objPtr = Tcl_NewIntObj(i);