diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-04 16:21:34 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-03-04 16:21:34 (GMT) |
| commit | 5349117d0c82cb371549d44fb26dfde45394ea25 (patch) | |
| tree | fc2a2daf1a6f25ece7e7ca47ea7293ec6d115c58 /generic/tclEncoding.c | |
| parent | 0ec3dc2c679bb911cc324228beb5021fcf8251ef (diff) | |
| parent | b2f5cb2b5926675920e0bf8d12c39ee6e91ac1e0 (diff) | |
| download | tcl-5349117d0c82cb371549d44fb26dfde45394ea25.zip tcl-5349117d0c82cb371549d44fb26dfde45394ea25.tar.gz tcl-5349117d0c82cb371549d44fb26dfde45394ea25.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 29a14ae..d1dbb09 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -2896,7 +2896,7 @@ UtfToUcs2Proc( { const char *srcStart, *srcEnd, *srcClose, *dstStart, *dstEnd; int result, numChars; -#if TCL_UTF_MAX <= 3 +#if TCL_UTF_MAX < 4 int len; #endif Tcl_UniChar ch = 0; @@ -2927,7 +2927,7 @@ UtfToUcs2Proc( result = TCL_CONVERT_NOSPACE; break; } -#if TCL_UTF_MAX <= 3 +#if TCL_UTF_MAX < 4 src += (len = TclUtfToUniChar(src, &ch)); if ((ch >= 0xD800) && (len < 3)) { src += TclUtfToUniChar(src, &ch); @@ -3340,7 +3340,7 @@ Iso88591FromUtfProc( */ if (ch > 0xFF -#if TCL_UTF_MAX <= 3 +#if TCL_UTF_MAX < 4 || ((ch >= 0xD800) && (len < 3)) #endif ) { @@ -3348,7 +3348,7 @@ Iso88591FromUtfProc( result = TCL_CONVERT_UNKNOWN; break; } -#if TCL_UTF_MAX <= 3 +#if TCL_UTF_MAX < 4 if ((ch >= 0xD800) && (len < 3)) { len = 4; } |