diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-16 21:10:20 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-03-16 21:10:20 (GMT) |
| commit | bc2c8431fc3b9961eabac2d1d2dd19f4325ce0a9 (patch) | |
| tree | fadd915985c2810d77c7d8558fe2d51260975db9 /generic/tclStringObj.c | |
| parent | 842878d2d0eee1bafcd57bc809ddac15b27c0510 (diff) | |
| parent | 2ff70c01f60ef1dbb586489d97b1f36368ad6741 (diff) | |
| download | tcl-bc2c8431fc3b9961eabac2d1d2dd19f4325ce0a9.zip tcl-bc2c8431fc3b9961eabac2d1d2dd19f4325ce0a9.tar.gz tcl-bc2c8431fc3b9961eabac2d1d2dd19f4325ce0a9.tar.bz2 | |
Merge 8.7
Move up some stub entries related to Tcl_UniChar
Use TCL_UTF_MAX=4 for full Unicode in stead of TCL_UTF_MAX=6 (TCL_UTF_MAX: 3 is default)
Diffstat (limited to 'generic/tclStringObj.c')
| -rw-r--r-- | generic/tclStringObj.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/generic/tclStringObj.c b/generic/tclStringObj.c index 6cbf5e7..205db00 100644 --- a/generic/tclStringObj.c +++ b/generic/tclStringObj.c @@ -568,7 +568,7 @@ Tcl_GetUniChar( return -1; } ch = stringPtr->unicode[index]; -#if TCL_UTF_MAX <= 4 +#if TCL_UTF_MAX == 3 /* See: bug [11ae2be95dac9417] */ if ((ch & 0xF800) == 0xD800) { if (ch & 0x400) { @@ -606,7 +606,7 @@ Tcl_GetUniChar( *---------------------------------------------------------------------- */ -#if !defined(TCL_NO_DEPRECATED) && (TCL_UTF_MAX<=4) +#if !defined(TCL_NO_DEPRECATED) && (TCL_UTF_MAX==3) #undef Tcl_GetUnicode unsigned short * Tcl_GetUnicode( @@ -752,7 +752,7 @@ Tcl_GetRange( if (last < first) { return Tcl_NewObj(); } -#if TCL_UTF_MAX <= 4 +#if TCL_UTF_MAX == 3 /* See: bug [11ae2be95dac9417] */ if ((first > 0) && ((stringPtr->unicode[first] & 0xFC00) == 0xDC00) && ((stringPtr->unicode[first-1] & 0xFC00) == 0xD800)) { @@ -2041,7 +2041,7 @@ Tcl_AppendFormatToObj( } break; case 'c': { - char buf[TCL_UTF_MAX] = ""; + char buf[4] = ""; int code, length; if (TclGetIntFromObj(interp, segment, &code) != TCL_OK) { |