diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-18 14:29:56 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-11-18 14:29:56 (GMT) |
| commit | 0ebd62435dc4cc8b5ba2050d485dc8e5ae794082 (patch) | |
| tree | 58a504a96fab64835f007ce868e32c6cd4e8bf0a /generic/tclInt.h | |
| parent | 66ed43d1fe6eee5083e335459b4007b4c7d383cc (diff) | |
| parent | 8e1f957a669b2f4b84dca7e8a27f2985c0625172 (diff) | |
| download | tcl-0ebd62435dc4cc8b5ba2050d485dc8e5ae794082.zip tcl-0ebd62435dc4cc8b5ba2050d485dc8e5ae794082.tar.gz tcl-0ebd62435dc4cc8b5ba2050d485dc8e5ae794082.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclInt.h')
| -rw-r--r-- | generic/tclInt.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tclInt.h b/generic/tclInt.h index 2a0dfa6..3a759ca 100644 --- a/generic/tclInt.h +++ b/generic/tclInt.h @@ -3183,12 +3183,14 @@ MODULE_SCOPE size_t TclUtfCount(int ch); #if TCL_UTF_MAX > 3 # define TclUtfToUCS4 Tcl_UtfToUniChar # define TclUniCharToUCS4(src, ptr) (*ptr = *(src),1) +# define TclUCS4Prev(src, ptr) (((src) > (ptr)) ? ((src) - 1) : (src)) # define TclUCS4Complete Tcl_UtfCharComplete # define TclChar16Complete(src, length) (((unsigned)((unsigned char)*(src) - 0xF0) < 5) \ ? ((length) >= 3) : Tcl_UtfCharComplete((src), (length))) #else - MODULE_SCOPE int TclUtfToUCS4(const char *src, int *ucs4Ptr); - MODULE_SCOPE int TclUniCharToUCS4(const Tcl_UniChar *src, int *ucs4Ptr); + MODULE_SCOPE int TclUtfToUCS4(const char *, int *); + MODULE_SCOPE int TclUniCharToUCS4(const Tcl_UniChar *, int *); + MODULE_SCOPE const Tcl_UniChar *TclUCS4Prev(const Tcl_UniChar *, const Tcl_UniChar *); # define TclUCS4Complete(src, length) (((unsigned)((unsigned char)*(src) - 0xF0) < 5) \ ? ((length) >= 4) : Tcl_UtfCharComplete((src), (length))) # define TclChar16Complete Tcl_UtfCharComplete |