summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-09-16 13:01:42 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-09-16 13:01:42 (GMT)
commit25135fefaea603aa1f4bd521329b9a254ee76fed (patch)
tree7a748edee894c4992d6605eda10963edcf27b6e6
parent6b9fd91cb423efbab3b7cab0c94f43b7da713024 (diff)
downloadtcl-25135fefaea603aa1f4bd521329b9a254ee76fed.zip
tcl-25135fefaea603aa1f4bd521329b9a254ee76fed.tar.gz
tcl-25135fefaea603aa1f4bd521329b9a254ee76fed.tar.bz2
Don't change Tcl_UniChar type when TCL_UTF_MAX == 4 (not supported anyway)
-rw-r--r--ChangeLog5
-rw-r--r--generic/regcustom.h2
-rw-r--r--generic/tcl.h2
3 files changed, 7 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 6911e2b..d745966 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-16 Jan Nijtmans <nijtmans@users.sf.net>
+
+ * generic/tcl.h: Don't change Tcl_UniChar type when
+ * generic/regcustom.h: TCL_UTF_MAX == 4 (not supported anyway)
+
2011-09-13 Don Porter <dgp@users.sourceforge.net>
* generic/tclUtil.c: [Bug 3390638] Workaround broken solaris
diff --git a/generic/regcustom.h b/generic/regcustom.h
index e258acd..5b6815c 100644
--- a/generic/regcustom.h
+++ b/generic/regcustom.h
@@ -91,7 +91,7 @@ typedef int celt; /* type to hold chr, MCCE number, or NOCELT */
#define NOCELT (-1) /* celt value which is not valid chr or MCCE */
#define CHR(c) (UCHAR(c)) /* turn char literal into chr literal */
#define DIGITVAL(c) ((c)-'0') /* turn chr digit into its value */
-#if TCL_UTF_MAX > 3
+#if TCL_UTF_MAX > 4
#define CHRBITS 32 /* bits in a chr; must not use sizeof */
#define CHR_MIN 0x00000000 /* smallest and largest chr; the value */
#define CHR_MAX 0xffffffff /* CHR_MAX-CHR_MIN+1 should fit in uchr */
diff --git a/generic/tcl.h b/generic/tcl.h
index bd720ff..ec64cac 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2244,7 +2244,7 @@ typedef struct Tcl_Parse {
* This represents a Unicode character. Any changes to this should
* also be reflected in regcustom.h.
*/
-#if TCL_UTF_MAX > 3
+#if TCL_UTF_MAX > 4
/*
* unsigned int isn't 100% accurate as it should be a strict 4-byte
* value (perhaps wchar_t). 64-bit systems may have troubles. The