diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-02 16:53:42 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-02 16:53:42 (GMT) |
| commit | 8c315fd31ff823b217374dd32577e04c42674249 (patch) | |
| tree | 85b723f08e36160bc0b6f437d9cd6bced8d061dd /generic/tclScan.c | |
| parent | c0c278ccb909abc9b83305b8873e3171f5d9ab02 (diff) | |
| parent | d0eefe67c87f69a16ae393d0ab5eb0847292c340 (diff) | |
| download | tcl-8c315fd31ff823b217374dd32577e04c42674249.zip tcl-8c315fd31ff823b217374dd32577e04c42674249.tar.gz tcl-8c315fd31ff823b217374dd32577e04c42674249.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclScan.c')
| -rw-r--r-- | generic/tclScan.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclScan.c b/generic/tclScan.c index 3529951..775e42a 100644 --- a/generic/tclScan.c +++ b/generic/tclScan.c @@ -881,8 +881,8 @@ Tcl_ScanObjCmd( offset = TclUtfToUniChar(string, &sch); i = (int)sch; -#if TCL_UTF_MAX == 4 - if (((sch & 0xFC00) == 0xD800) && (offset < 3)) { +#if TCL_UTF_MAX <= 4 + if ((sch >= 0xD800) && (offset < 3)) { offset += TclUtfToUniChar(string+offset, &sch); i = (((i<<10) & 0x0FFC00) + 0x10000) + (sch & 0x3FF); } |