diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-07 07:29:19 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2022-02-07 07:29:19 (GMT) |
| commit | 14cfa5f602f6754eb78c232a5ae679bc2e897553 (patch) | |
| tree | 57be307083b20ece5594a007f4d571ca380e2d98 /generic/tkMain.c | |
| parent | b53163f030999827cefb671c9c15d4954b364415 (diff) | |
| parent | f0c230e4b0cebeeb67e59e497ef5cdaeda1a8696 (diff) | |
| download | tk-14cfa5f602f6754eb78c232a5ae679bc2e897553.zip tk-14cfa5f602f6754eb78c232a5ae679bc2e897553.tar.gz tk-14cfa5f602f6754eb78c232a5ae679bc2e897553.tar.bz2 | |
Merge 8.6
Diffstat (limited to 'generic/tkMain.c')
| -rw-r--r-- | generic/tkMain.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/generic/tkMain.c b/generic/tkMain.c index 190635f..67617f4 100644 --- a/generic/tkMain.c +++ b/generic/tkMain.c @@ -25,11 +25,10 @@ extern int TkCygwinMainEx(int, char **, Tcl_AppInitProc *, Tcl_Interp *); static const char DEFAULT_PRIMARY_PROMPT[] = "% "; /* - * This file can be compiled on Windows in UNICODE mode, as well as - * on all other platforms using the native encoding. This is done - * by using the normal Windows functions like _tcscmp, but on - * platforms which don't have <tchar.h> we have to translate that - * to strcmp here. + * This file can be compiled on Windows in UNICODE mode, as well as on all + * other platforms using the native encoding. This is done by using the normal + * Windows functions like _tcscmp, but on platforms which don't have <tchar.h> + * we have to translate that to strcmp here. */ #ifdef _WIN32 #ifdef __cplusplus @@ -68,7 +67,7 @@ NewNativeObj( Tcl_Obj *obj; Tcl_DString ds; -#ifdef UNICODE +#if defined(_WIN32) && defined(UNICODE) Tcl_DStringInit(&ds); Tcl_WCharToUtfDString(string, wcslen(string), &ds); #else |