diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-19 15:36:11 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-09-19 15:36:11 (GMT) |
| commit | dc6c385849bdbc223accd3eef16355e2bbdff671 (patch) | |
| tree | cb4463287ab648160b78ed67abdaf5a95a0742f3 /generic/tclPlatDecls.h | |
| parent | 52e96157d28e998adf71cf30b27b3e40ebeaa715 (diff) | |
| parent | 39795a1da493f0ea91a228e768c0c656156ab340 (diff) | |
| download | tcl-dc6c385849bdbc223accd3eef16355e2bbdff671.zip tcl-dc6c385849bdbc223accd3eef16355e2bbdff671.tar.gz tcl-dc6c385849bdbc223accd3eef16355e2bbdff671.tar.bz2 | |
Merge 8.7
Diffstat (limited to 'generic/tclPlatDecls.h')
| -rw-r--r-- | generic/tclPlatDecls.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/generic/tclPlatDecls.h b/generic/tclPlatDecls.h index b1a874f..b1f6ecd 100644 --- a/generic/tclPlatDecls.h +++ b/generic/tclPlatDecls.h @@ -99,16 +99,11 @@ extern const TclPlatStubs *tclPlatStubsPtr; #undef TCL_STORAGE_CLASS #define TCL_STORAGE_CLASS DLLIMPORT -#if defined(USE_TCL_STUBS) && (defined(_WIN32) || defined(__CYGWIN__))\ - && (defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8) -#undef Tcl_WinUtfToTChar -#undef Tcl_WinTCharToUtf -#ifdef _WIN32 +#if defined(USE_TCL_STUBS) && defined(_WIN32) #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 + (char *)Tcl_Char16ToUtfDString((const unsigned short *)(string), ((((len) + 2) >> 1) - 1), (dsPtr))) #endif #endif /* _TCLPLATDECLS */ |