summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjan.nijtmans <nijtmans@users.sourceforge.net>2011-09-16 13:09:11 (GMT)
committerjan.nijtmans <nijtmans@users.sourceforge.net>2011-09-16 13:09:11 (GMT)
commit5607dedaa88b132947328b366d78dc0f79cdd5f6 (patch)
tree984b9bafb72ed42c264226830781c12686ef9af7
parentb70ab023a4e2ec3bfb8ebccf59b92519d5a5dbba (diff)
parent25135fefaea603aa1f4bd521329b9a254ee76fed (diff)
downloadtcl-5607dedaa88b132947328b366d78dc0f79cdd5f6.zip
tcl-5607dedaa88b132947328b366d78dc0f79cdd5f6.tar.gz
tcl-5607dedaa88b132947328b366d78dc0f79cdd5f6.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 40814b2..d0d5ed2 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-16 Donal K. Fellows <dkf@users.sf.net>
* library/http/http.tcl (http::geturl): [Bug 3391977]: Ensure that the
diff --git a/generic/regcustom.h b/generic/regcustom.h
index ac33087..57a2d47 100644
--- a/generic/regcustom.h
+++ b/generic/regcustom.h
@@ -97,7 +97,7 @@ typedef int celt; /* Type to hold chr, or NOCELT */
#define NOCELT (-1) /* Celt value which is not valid chr */
#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 88b68db..51e3ce3 100644
--- a/generic/tcl.h
+++ b/generic/tcl.h
@@ -2135,7 +2135,7 @@ typedef struct Tcl_Parse {
* 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 size of this