summaryrefslogtreecommitdiffstats
path: root/generic/tclUtf.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2022-04-01 13:13:06 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2022-04-01 13:13:06 (GMT)
commit67c5964d062b5119e03cf1c3e2fdd9a2da5f2540 (patch)
treef1b908e807872e62c59d2d2079308eb5f1ecfa5e /generic/tclUtf.c
parent4c82bda7741adb7962582755a619a9768f0ee8fa (diff)
parentd0fec7532c33f0b3da8057e2e0fda10524f22905 (diff)
downloadtcl-67c5964d062b5119e03cf1c3e2fdd9a2da5f2540.zip
tcl-67c5964d062b5119e03cf1c3e2fdd9a2da5f2540.tar.gz
tcl-67c5964d062b5119e03cf1c3e2fdd9a2da5f2540.tar.bz2
Merge 9.0
Diffstat (limited to 'generic/tclUtf.c')
-rw-r--r--generic/tclUtf.c3
1 files changed, 1 insertions, 2 deletions
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);
}
}