summaryrefslogtreecommitdiffstats
path: root/generic/tclStringObj.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2019-03-12 20:39:42 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2019-03-12 20:39:42 (GMT)
commitda96c5304100d70d932bcb73796c068d7e416cae (patch)
tree70ebb652915b8a287b4fca9dc7e7f8e8165ba3c2 /generic/tclStringObj.c
parent8e7a963f7fb10cc556337a18a652fd0c78c51029 (diff)
downloadtcl-da96c5304100d70d932bcb73796c068d7e416cae.zip
tcl-da96c5304100d70d932bcb73796c068d7e416cae.tar.gz
tcl-da96c5304100d70d932bcb73796c068d7e416cae.tar.bz2
Even better support for -DTCL_UTF_MAX=6. Ongoing improvements (TIP being planned)
Diffstat (limited to 'generic/tclStringObj.c')
-rw-r--r--generic/tclStringObj.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c
index ee0a3c3..6cbf5e7 100644
--- a/generic/tclStringObj.c
+++ b/generic/tclStringObj.c
@@ -606,14 +606,14 @@ Tcl_GetUniChar(
*----------------------------------------------------------------------
*/
-#ifndef TCL_NO_DEPRECATED
+#if !defined(TCL_NO_DEPRECATED) && (TCL_UTF_MAX<=4)
#undef Tcl_GetUnicode
-Tcl_UniChar *
+unsigned short *
Tcl_GetUnicode(
Tcl_Obj *objPtr) /* The object to find the unicode string
* for. */
{
- return Tcl_GetUnicodeFromObj(objPtr, NULL);
+ return Tcl_GetUtf16FromObj(objPtr, NULL);
}
#endif /* TCL_NO_DEPRECATED */