diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-15 12:11:51 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2020-03-15 12:11:51 (GMT) |
| commit | 27ee10bdf0fa2f7838073ceda95963b7e0ee71bd (patch) | |
| tree | d99f0826246d4d41cab71ed69964e1baed0ba21d /win | |
| parent | ad027699337cb14f37a3914d03a1504da8d0f946 (diff) | |
| parent | 13be49f5852a9f3bb1a82aa726f16322d00d38e7 (diff) | |
| download | tcl-27ee10bdf0fa2f7838073ceda95963b7e0ee71bd.zip tcl-27ee10bdf0fa2f7838073ceda95963b7e0ee71bd.tar.gz tcl-27ee10bdf0fa2f7838073ceda95963b7e0ee71bd.tar.bz2 | |
Merge 8.6. Also fix build with -DTCL_NO_DEPRECATED (which was also the cause of the "master" build failure)
Diffstat (limited to 'win')
| -rw-r--r-- | win/tclWinInit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/win/tclWinInit.c b/win/tclWinInit.c index 8892767..6e84db6 100644 --- a/win/tclWinInit.c +++ b/win/tclWinInit.c @@ -626,8 +626,8 @@ TclpSetVariables( #if defined(_WIN32) # define tenviron _wenviron -# define tenviron2utfdstr(tenvstr, len, dstr) \ - Tcl_WinTCharToUtf((TCHAR *)tenvstr, len, dstr) +# define tenviron2utfdstr(string, len, dsPtr) (Tcl_DStringInit(dsPtr), \ + (char *)Tcl_Char16ToUtfDString((const unsigned short *)(string), ((((len) + 2) >> 1) - 1), (dsPtr))) #else # define tenviron environ # define tenviron2utfdstr(tenvstr, len, dstr) \ |