diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-11 07:18:07 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-07-11 07:18:07 (GMT) |
| commit | c5ced4ccd624f5ba4d19277b7d2394b4e9c41f88 (patch) | |
| tree | 7e49ddd6d6f020baa55baa85dfe175b836785f4a /generic/tclPlatDecls.h | |
| parent | a0676d22d0b93bc7c895eabce277cafd42d2a4de (diff) | |
| download | tcl-c5ced4ccd624f5ba4d19277b7d2394b4e9c41f88.zip tcl-c5ced4ccd624f5ba4d19277b7d2394b4e9c41f88.tar.gz tcl-c5ced4ccd624f5ba4d19277b7d2394b4e9c41f88.tar.bz2 | |
Rename UTF-related functions to "WChar" and "Char16" variants, more intuitive because they represent wchar_t and char16_t (since C++11) types in modern compilers.
Diffstat (limited to 'generic/tclPlatDecls.h')
| -rw-r--r-- | generic/tclPlatDecls.h | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index 42478ac..354d752 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -122,12 +122,10 @@ extern const TclPlatStubs *tclPlatStubsPtr; #undef Tcl_WinUtfToTChar #undef Tcl_WinTCharToUtf #ifdef _WIN32 -#define Tcl_WinUtfToTChar(string, len, dsPtr) ((Tcl_DStringInit(dsPtr), (string) != NULL) \ - ? (TCHAR *)Tcl_UtfToWCharDString((string), (len), (dsPtr)) \ - : ((void)(len), NULL)) -#define Tcl_WinTCharToUtf(string, len, dsPtr) ((Tcl_DStringInit(dsPtr), (string) != NULL) \ - ? (char *)Tcl_WCharToUtfDString((string), ((int)(len) >> 1), (dsPtr)) \ - : ((void)(len), NULL)) +#define Tcl_WinUtfToTChar(string, len, dsPtr) (Tcl_DStringInit(dsPtr), \ + (TCHAR *)Tcl_UtfToChar16DString((string), (len), (dsPtr))) +#define Tcl_WinTCharToUtf(string, len, dsPtr) (Tcl_DStringInit(dsPtr), \ + (char *)Tcl_Char16ToUtfDString((string), ((((len) + 2) >> 1) - 1), (dsPtr))) #endif #endif |