diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-07 20:38:54 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-07 20:38:54 (GMT) |
| commit | d6fda47fa83529c59f32df1e8ba6541d58f83bd9 (patch) | |
| tree | 98a92fab70d068cbf27a878c3287df3919249f94 /generic/tclUtf.c | |
| parent | 3e181ede9d6b4c3b54b754325910abbe7fe66212 (diff) | |
| parent | b02bf2903655487dd351643830a50035ffb4aecd (diff) | |
| download | tcl-d6fda47fa83529c59f32df1e8ba6541d58f83bd9.zip tcl-d6fda47fa83529c59f32df1e8ba6541d58f83bd9.tar.gz tcl-d6fda47fa83529c59f32df1e8ba6541d58f83bd9.tar.bz2 | |
Merge 8.7, and a few tweaks: Only provide Tcl_WinUtfToTChar on Tcl 8.x, not on 9.0 any more
Diffstat (limited to 'generic/tclUtf.c')
| -rw-r--r-- | generic/tclUtf.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/generic/tclUtf.c b/generic/tclUtf.c index 395f4ed..962a3e2 100644 --- a/generic/tclUtf.c +++ b/generic/tclUtf.c @@ -260,6 +260,7 @@ Tcl_UniCharToUtfDString( return string; } +#undef Tcl_WCharToUtfDString char * Tcl_WCharToUtfDString( const unsigned short *uniStr, /* Utf-16 string to convert to UTF-8. */ @@ -608,6 +609,7 @@ Tcl_UtfToUniCharDString( return wString; } +#undef Tcl_UtfToWCharDString unsigned short * Tcl_UtfToWCharDString( const char *src, /* UTF-8 string to convert to Unicode. */ |