diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-15 13:19:31 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2021-03-15 13:19:31 (GMT) |
| commit | 2e8db9a108c3539b68e894749c0e05e1d5ae871e (patch) | |
| tree | c08c445cdf06374df489425b8050bebf9f5d413f | |
| parent | c646a67fd295620422863a3ab3ac74eff316aec3 (diff) | |
| parent | c54d29df06056eda6a5dd8c5845283204d56418f (diff) | |
| download | tcl-2e8db9a108c3539b68e894749c0e05e1d5ae871e.zip tcl-2e8db9a108c3539b68e894749c0e05e1d5ae871e.tar.gz tcl-2e8db9a108c3539b68e894749c0e05e1d5ae871e.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | generic/tclTest.c | 3 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 6 | ||||
| -rw-r--r-- | generic/tclZlib.c | 2 |
3 files changed, 4 insertions, 7 deletions
diff --git a/generic/tclTest.c b/generic/tclTest.c index 5c719c1..03bb581 100644 --- a/generic/tclTest.c +++ b/generic/tclTest.c @@ -19,9 +19,6 @@ #ifndef USE_TCL_STUBS # define USE_TCL_STUBS #endif -#ifndef TCL_NO_DEPRECATED -# define TCL_NO_DEPRECATED -#endif #include "tclInt.h" #ifdef TCL_WITH_EXTERNAL_TOMMATH # include "tommath.h" diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index e0249f8..9dcfb4a 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -343,7 +343,7 @@ static int ZipChannelClose(void *instanceData, static Tcl_DriverGetHandleProc ZipChannelGetFile; static int ZipChannelRead(void *instanceData, char *buf, int toRead, int *errloc); -#ifndef TCL_NO_DEPRECATED +#if !defined(TCL_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9) static int ZipChannelSeek(void *instanceData, long offset, int mode, int *errloc); #endif @@ -402,7 +402,7 @@ static Tcl_ChannelType ZipChannelType = { TCL_CLOSE2PROC, /* Close channel, clean instance data */ ZipChannelRead, /* Handle read request */ ZipChannelWrite, /* Handle write request */ -#ifndef TCL_NO_DEPRECATED +#if !defined(TCL_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9) ZipChannelSeek, /* Move location of access point, NULL'able */ #else NULL, /* Move location of access point, NULL'able */ @@ -4055,7 +4055,7 @@ ZipChannelWideSeek( return info->numRead; } -#ifndef TCL_NO_DEPRECATED +#if !defined(TCL_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9) static int ZipChannelSeek( void *instanceData, diff --git a/generic/tclZlib.c b/generic/tclZlib.c index da45b2e..85b4dc3 100644 --- a/generic/tclZlib.c +++ b/generic/tclZlib.c @@ -3969,7 +3969,7 @@ TclZlibInit( * Formally provide the package as a Tcl built-in. */ -#ifndef TCL_NO_DEPRECATED +#if !defined(TCL_NO_DEPRECATED) && (TCL_MAJOR_VERSION < 9) Tcl_PkgProvideEx(interp, "zlib", TCL_ZLIB_VERSION, NULL); #endif return Tcl_PkgProvideEx(interp, "tcl::zlib", TCL_ZLIB_VERSION, NULL); |