summaryrefslogtreecommitdiffstats
path: root/generic/tclUniData.c
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-02 09:02:53 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2015-09-02 09:02:53 (GMT)
commit4792d8fa003475b958ece0abf90a69cc56b6ff87 (patch)
tree635acee6a7924d49d3eff0316878fdc95d55a8c7 /generic/tclUniData.c
parentb13ad887186f6e841d696f4b08dc53f9a2aab8a4 (diff)
parentd9762826b9be695651c7a4657a20246991e39dda (diff)
downloadtcl-4792d8fa003475b958ece0abf90a69cc56b6ff87.zip
tcl-4792d8fa003475b958ece0abf90a69cc56b6ff87.tar.gz
tcl-4792d8fa003475b958ece0abf90a69cc56b6ff87.tar.bz2
Merge trunk.
Gustaf's latest and greatest fix.
Diffstat (limited to 'generic/tclUniData.c')
-rw-r--r--generic/tclUniData.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/generic/tclUniData.c b/generic/tclUniData.c
index d2f66fe..1ca119d 100644
--- a/generic/tclUniData.c
+++ b/generic/tclUniData.c
@@ -1556,4 +1556,8 @@ enum {
* Unicode character tables.
*/
-#define GetUniCharInfo(ch) (groups[groupMap[pageMap[((ch) & 0xffff) >> OFFSET_BITS] | ((ch) & ((1 << OFFSET_BITS)-1))]])
+#if TCL_UTF_MAX > 3
+# define GetUniCharInfo(ch) (groups[groupMap[pageMap[((ch) & 0x1fffff) >> OFFSET_BITS] | ((ch) & ((1 << OFFSET_BITS)-1))]])
+#else
+# define GetUniCharInfo(ch) (groups[groupMap[pageMap[((ch) & 0xffff) >> OFFSET_BITS] | ((ch) & ((1 << OFFSET_BITS)-1))]])
+#endif