diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-04-01 10:33:49 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-04-01 10:33:49 (GMT) |
| commit | 1032ad84856a104fff31d094fc76ac0758c57c39 (patch) | |
| tree | 37a5ddf3cf4083e54cecfaf9eacc693756e7c291 | |
| parent | 442a57b4bfdc8e30c31dbd98239c508ce8ca364f (diff) | |
| parent | d0fec7532c33f0b3da8057e2e0fda10524f22905 (diff) | |
| download | tcl-1032ad84856a104fff31d094fc76ac0758c57c39.zip tcl-1032ad84856a104fff31d094fc76ac0758c57c39.tar.gz tcl-1032ad84856a104fff31d094fc76ac0758c57c39.tar.bz2 | |
Merge 9.0
| -rw-r--r-- | generic/tclStringObj.c | 3 | ||||
| -rw-r--r-- | generic/tclUtf.c | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 510907f..cad30d7 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -394,7 +394,6 @@ Tcl_NewUnicodeObj( *---------------------------------------------------------------------- */ -#undef Tcl_GetCharLength size_t Tcl_GetCharLength( Tcl_Obj *objPtr) /* The String object to get the num chars @@ -643,10 +642,10 @@ TclGetUniChar( return -1; } const char *begin = TclUtfAtIndex(objPtr->bytes, index); +#undef Tcl_UtfToUniChar Tcl_UtfToUniChar(begin, &ch); return ch; } - /* *---------------------------------------------------------------------- diff --git a/generic/tclUtf.c b/generic/tclUtf.c index 09e464f..6f43dc4 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -799,7 +799,6 @@ Tcl_UtfCharComplete( *--------------------------------------------------------------------------- */ -#undef Tcl_NumUtfChars size_t Tcl_NumUtfChars( const char *src, /* The UTF-8 string to measure. */ @@ -1220,7 +1219,6 @@ Tcl_UniCharAtIndex( *--------------------------------------------------------------------------- */ -#undef Tcl_UtfAtIndex const char * Tcl_UtfAtIndex( const char *src, /* The UTF-8 string. */ @@ -1230,6 +1228,7 @@ Tcl_UtfAtIndex( if (index != TCL_INDEX_NONE) { while (index--) { + /* Make use of the #undef Tcl_UtfToUniChar above, which already handles UCS4. */ src += Tcl_UtfToUniChar(src, &ch); } } |