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/tclStubInit.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/tclStubInit.c')
| -rw-r--r-- | generic/tclStubInit.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/generic/tclStubInit.c b/generic/tclStubInit.c index 7c9741a..8da0123 100644 --- a/generic/tclStubInit.c +++ b/generic/tclStubInit.c @@ -248,7 +248,7 @@ TclpGetPid(Tcl_Pid pid) return (int) (size_t) pid; } -#if (TCL_UTF_MAX <= 4) && !defined(TCL_NO_DEPRECATED) +#if !defined(TCL_NO_DEPRECATED) && TCL_MAJOR_VERSION < 9 #undef Tcl_WinUtfToTChar char * Tcl_WinUtfToTChar( @@ -480,7 +480,7 @@ tellOld( } #endif /* !TCL_NO_DEPRECATED */ -#if (TCL_UTF_MAX > 4) || defined(TCL_NO_DEPRECATED) +#if defined(TCL_NO_DEPRECATED) || TCL_MAJOR_VERSION > 8 #define Tcl_WinUtfToTChar 0 #define Tcl_WinTCharToUtf 0 #endif |