diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-12 20:38:09 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-12 20:38:09 (GMT) |
| commit | 8ddf96d852b04a3a1e7e109e16f8c3a21b31d2a2 (patch) | |
| tree | c262b99e7f7de8144329705bc6ff747d7cdf08c8 /generic/tclEncoding.c | |
| parent | 2b096ec26df0564a66dc13dc0f0b84942db5273e (diff) | |
| parent | 9c94b7bd7657d1734dd6ce7d0e91d2606c6d0945 (diff) | |
| download | tcl-8ddf96d852b04a3a1e7e109e16f8c3a21b31d2a2.zip tcl-8ddf96d852b04a3a1e7e109e16f8c3a21b31d2a2.tar.gz tcl-8ddf96d852b04a3a1e7e109e16f8c3a21b31d2a2.tar.bz2 | |
Merge branch tip-548. No longer define addtional stub-entries for functions that will be removed (because of deprecation) anyway
Diffstat (limited to 'generic/tclEncoding.c')
| -rw-r--r-- | generic/tclEncoding.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/generic/tclEncoding.c b/generic/tclEncoding.c index 34fd551..e7cc344 100644 --- a/generic/tclEncoding.c +++ b/generic/tclEncoding.c @@ -2418,7 +2418,7 @@ UtfToUtfProc( int len = TclUtfToUniChar(src, chPtr); src += len; dst += Tcl_UniCharToUtf(*chPtr, dst); -#if TCL_UTF_MAX == 3 +#if TCL_UTF_MAX <= 3 if ((*chPtr >= 0xD800) && (len < 3)) { src += TclUtfToUniChar(src + len, chPtr); dst += Tcl_UniCharToUtf(*chPtr, dst); @@ -2691,7 +2691,7 @@ UtfToUcs2Proc( { const char *srcStart, *srcEnd, *srcClose, *dstStart, *dstEnd; int result, numChars; -#if TCL_UTF_MAX == 3 +#if TCL_UTF_MAX <= 3 int len; #endif Tcl_UniChar ch = 0; @@ -2721,7 +2721,7 @@ UtfToUcs2Proc( result = TCL_CONVERT_NOSPACE; break; } -#if TCL_UTF_MAX == 3 +#if TCL_UTF_MAX <= 3 src += (len = TclUtfToUniChar(src, &ch)); if ((ch >= 0xD800) && (len < 3)) { src += TclUtfToUniChar(src, &ch); @@ -3156,7 +3156,7 @@ Iso88591FromUtfProc( */ if (ch > 0xff -#if TCL_UTF_MAX == 3 +#if TCL_UTF_MAX <= 3 || ((ch >= 0xD800) && (len < 3)) #endif ) { @@ -3164,7 +3164,7 @@ Iso88591FromUtfProc( result = TCL_CONVERT_UNKNOWN; break; } -#if TCL_UTF_MAX == 3 +#if TCL_UTF_MAX <= 3 if ((ch >= 0xD800) && (len < 3)) len = 4; #endif /* |