diff options
| author | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-15 15:33:46 (GMT) |
|---|---|---|
| committer | jan.nijtmans <nijtmans@users.sourceforge.net> | 2019-08-15 15:33:46 (GMT) |
| commit | b4243394a87e1101ca0569b4ca88550d7f9ee95c (patch) | |
| tree | 396e3b3680fe5217650049ac7fc5fa43223bb596 | |
| parent | 2d85a1f9deb33cad80923f44a691189b7aefd8a5 (diff) | |
| parent | 7c060e830b6573d92fab57f30437f7d969164079 (diff) | |
| download | tcl-b4243394a87e1101ca0569b4ca88550d7f9ee95c.zip tcl-b4243394a87e1101ca0569b4ca88550d7f9ee95c.tar.gz tcl-b4243394a87e1101ca0569b4ca88550d7f9ee95c.tar.bz2 | |
Merge 8.7
| -rw-r--r-- | compat/zlib/contrib/minizip/crypt.h | 2 | ||||
| -rw-r--r-- | generic/tclZipfs.c | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/compat/zlib/contrib/minizip/crypt.h b/compat/zlib/contrib/minizip/crypt.h index 2c3044b..c422c26 100644 --- a/compat/zlib/contrib/minizip/crypt.h +++ b/compat/zlib/contrib/minizip/crypt.h @@ -57,7 +57,7 @@ static int update_keys(unsigned long* pkeys,const z_crc_t* pcrc_32_tab,int c) (*(pkeys+1)) += (*(pkeys+0)) & 0xff; (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1; { - int keyshift = (int)((*(pkeys+1)) >> 24); + register int keyshift = (int)((*(pkeys+1)) >> 24); (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift); } return c; diff --git a/generic/tclZipfs.c b/generic/tclZipfs.c index 0dca6f1..d59d893 100644 --- a/generic/tclZipfs.c +++ b/generic/tclZipfs.c @@ -399,9 +399,7 @@ static int ZipChannelWrite(void *instanceData, * Define the ZIP filesystem dispatch table. */ -MODULE_SCOPE const Tcl_Filesystem zipfsFilesystem; - -const Tcl_Filesystem zipfsFilesystem = { +static const Tcl_Filesystem zipfsFilesystem = { "zipfs", sizeof(Tcl_Filesystem), TCL_FILESYSTEM_VERSION_2, @@ -4729,7 +4727,7 @@ ZipFSLoadFile( *------------------------------------------------------------------------- */ -MODULE_SCOPE int +int TclZipfs_Init( Tcl_Interp *interp) /* Current interpreter. */ { |