diff options
author | dgp <dgp@users.sourceforge.net> | 2020-04-20 22:35:39 (GMT) |
---|---|---|
committer | dgp <dgp@users.sourceforge.net> | 2020-04-20 22:35:39 (GMT) |
commit | 58cf4db1ccb0602f9bd023ecc4e56830aea2453a (patch) | |
tree | add28081a10966d0c5a1ba2396f83807bc1fd74e | |
parent | dcd9929939e787c0f7e7933dcdbf55d9df010f4e (diff) | |
download | tcl-58cf4db1ccb0602f9bd023ecc4e56830aea2453a.zip tcl-58cf4db1ccb0602f9bd023ecc4e56830aea2453a.tar.gz tcl-58cf4db1ccb0602f9bd023ecc4e56830aea2453a.tar.bz2 |
Tie together the TCL_UTF_MAX=4 and TCL_UTF_MAX=6 builds to mean the same
thing on the 8.5 branch -- use internal UCS-4 storage.
-rw-r--r-- | generic/regcustom.h | 2 | ||||
-rw-r--r-- | generic/tcl.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/generic/regcustom.h b/generic/regcustom.h index 57a2d47..ac33087 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 > 4 +#if TCL_UTF_MAX > 3 #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 7378a8f..d7d064c 100644 --- a/generic/tcl.h +++ b/generic/tcl.h @@ -2148,7 +2148,7 @@ typedef struct Tcl_Parse { * reflected in regcustom.h. */ -#if TCL_UTF_MAX > 4 +#if TCL_UTF_MAX > 3 /* * 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 |