summaryrefslogtreecommitdiffstats
path: root/generic/tkInt.h
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-26 11:47:47 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2016-09-26 11:47:47 (GMT)
commit1119e63470fa87743572b452320e7d583e5faf19 (patch)
treef0a254d7f7117292a91d85b80d03179e2530523f /generic/tkInt.h
parent9bfe23ec8dfc74285682572d55318e5b1fe5befb (diff)
parent6fc7c3942a4f1f84b585a5570818f98299254c51 (diff)
downloadtk-1119e63470fa87743572b452320e7d583e5faf19.zip
tk-1119e63470fa87743572b452320e7d583e5faf19.tar.gz
tk-1119e63470fa87743572b452320e7d583e5faf19.tar.bz2
merge core-8-6-branch
Diffstat (limited to 'generic/tkInt.h')
-rw-r--r--generic/tkInt.h8
1 files changed, 8 insertions, 0 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h
index 0b502e4..1615a81 100644
--- a/generic/tkInt.h
+++ b/generic/tkInt.h
@@ -1232,6 +1232,14 @@ MODULE_SCOPE Status TkParseColor (Display * display,
MODULE_SCOPE void TkUnixSetXftClipRegion(TkRegion clipRegion);
#endif
+#if TCL_UTF_MAX > 4
+# define TkUtfToUniChar Tcl_UtfToUniChar
+# define TkUniCharToUtf Tcl_UniCharToUtf
+#else
+ MODULE_SCOPE int TkUtfToUniChar(const char *, int *);
+ MODULE_SCOPE int TkUniCharToUtf(int, char *);
+#endif
+
/*
* Unsupported commands.
*/