diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-16 12:17:59 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2016-09-16 12:17:59 (GMT) |
| commit | 7a5d64437977cc14b7b79e336b3b2a20785348e5 (patch) | |
| tree | 7a98c5e25eb278af7eb4c7fa58ab73d819c2c739 /generic/tkInt.h | |
| parent | 41d3c8f67e62fe307c46c91e5a42b71e39c59334 (diff) | |
| download | tk-7a5d64437977cc14b7b79e336b3b2a20785348e5.zip tk-7a5d64437977cc14b7b79e336b3b2a20785348e5.tar.gz tk-7a5d64437977cc14b7b79e336b3b2a20785348e5.tar.bz2 | |
Rename TkUtfToUniChar32 to TkUtfToUniChar2, and various simplifications needing less #ifdef's
Diffstat (limited to 'generic/tkInt.h')
| -rw-r--r-- | generic/tkInt.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/generic/tkInt.h b/generic/tkInt.h index 367ef3a..6d86e08 100644 --- a/generic/tkInt.h +++ b/generic/tkInt.h @@ -1232,8 +1232,10 @@ MODULE_SCOPE Status TkParseColor (Display * display, MODULE_SCOPE void TkUnixSetXftClipRegion(TkRegion clipRegion); #endif -#if TCL_UTF_MAX == 4 -MODULE_SCOPE int TkUtfToUniChar32(const char *src, int *chPtr); +#if TCL_UTF_MAX > 4 +# define TkUtfToUniChar2 Tcl_UtfToUniChar +#else + MODULE_SCOPE int TkUtfToUniChar2(const char *src, int *chPtr); #endif /* |