Import Tcl-code 8.6.8

compat/zlib/win32/Makefile.gcc

@@ -39,7 +39,7 @@ IMPLIB    = libz.dll.a
 SHARED_MODE=0
 
 #LOC = -DASMV
-#LOC = -DDEBUG -g
+#LOC = -DZLIB_DEBUG -g
 
 PREFIX =
 CC = $(PREFIX)gcc

compat/zlib/win32/Makefile.msc

@@ -1,5 +1,5 @@
 # Makefile for zlib using Microsoft (Visual) C
-# zlib is copyright (C) 1995-2006 Jean-loup Gailly and Mark Adler
+# zlib is copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 #
 # Usage:
 #   nmake -f win32/Makefile.msc                          (standard build)

compat/zlib/win32/README-WIN32.txt

@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.8 is a general purpose data compression library.  All the code is
+zlib 1.2.11 is a general purpose data compression library.  All the code is
 thread safe.  The data format used by the zlib library is described by RFCs
 (Request for Comments) 1950 to 1952 in the files
 http://www.ietf.org/rfc/rfc1950.txt (zlib format), rfc1951.txt (deflate format)
@@ -22,7 +22,7 @@ before asking for help.
 
 Manifest:
 
-The package zlib-1.2.8-win32-x86.zip will contain the following files:
+The package zlib-1.2.11-win32-x86.zip will contain the following files:
 
   README-WIN32.txt This document
   ChangeLog        Changes since previous zlib packages
@@ -72,7 +72,7 @@ are too numerous to cite here.
 
 Copyright notice:
 
-  (C) 1995-2012 Jean-loup Gailly and Mark Adler
+  (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

compat/zlib/win32/README.txt

@@ -6,7 +6,7 @@ What's here
 
 Source
 ======
-  zlib version 1.2.8
+  zlib version 1.2.11
   available at http://www.gzip.org/zlib/
 
 
@@ -25,9 +25,9 @@ Build info
   Contributed by Jan Nijtmans.
 
   Compiler:
-    i686-w64-mingw32-gcc (GCC) 4.5.3
+    i686-w64-mingw32-gcc (GCC) 5.4.0
   Library:
-    mingw64-i686-runtime/headers: 3.0b_svn5747-1
+    mingw64-i686-runtime/headers: 5.0.0
   Build commands:
     i686-w64-mingw32-gcc -c -DASMV contrib/asm686/match.S
     i686-w64-mingw32-gcc -c -DASMINF -I. -O3 contrib/inflate86/inffas86.c
@@ -37,7 +37,7 @@ Build info
 
 Copyright notice
 ================
-  Copyright (C) 1995-2010 Jean-loup Gailly and Mark Adler
+  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
   This software is provided 'as-is', without any express or implied
   warranty.  In no event will the authors be held liable for any damages

compat/zlib/win32/USAGE.txt

@@ -2,6 +2,9 @@
 Installing ZLIB1.DLL
 ====================
   Copy ZLIB1.DLL to the SYSTEM or the SYSTEM32 directory.
+  
+  If you want to install the 32-bit dll on a 64-bit
+  machine, use the SysWOW64 directory instead.
 
 
 Using ZLIB1.DLL with Microsoft Visual C++
@@ -20,12 +23,17 @@ Using ZLIB1.DLL with gcc/MinGW
    1. Install the supplied header files "zlib.h" and "zconf.h"
       into the INCLUDE directory.
 
-   2. Copy the supplied library file "zdll.lib" to "libzdll.a":
+   2. (32-bit): Copy the supplied library file "zdll.lib" to "libzdll.a":
         cp lib/zdll.lib lib/libzdll.a
 
       OR
 
-   2' Build the import library from the supplied "zlib.def":
+   2'. (64-bit): Copy the supplied library file "libz.dll.a" to "libzdll.a":
+        cp lib/libz.dll.a lib/libzdll.a
+
+      OR
+
+   2'' Build the import library from the supplied "zlib.def":
         dlltool -D zlib1.dll -d lib/zlib.def -l lib/libzdll.a
 
    3. Install "libzdll.a" into the LIB directory.

compat/zlib/win32/VisualC.txt

@@ -1,3 +1,3 @@
 
 To build zlib using the Microsoft Visual C++ environment,
-use the appropriate project from the projects/ directory.
+use the appropriate project from the contrib/vstudio/ directory.

compat/zlib/win32/zlib.def

@@ -8,6 +8,7 @@ EXPORTS
     inflateEnd
 ; advanced functions
     deflateSetDictionary
+    deflateGetDictionary
     deflateCopy
     deflateReset
     deflateParams
@@ -33,12 +34,15 @@ EXPORTS
     compress2
     compressBound
     uncompress
+    uncompress2
     gzopen
     gzdopen
     gzbuffer
     gzsetparams
     gzread
+    gzfread
     gzwrite
+    gzfwrite
     gzprintf
     gzvprintf
     gzputs
@@ -67,7 +71,9 @@ EXPORTS
     crc32_combine64
 ; checksum functions
     adler32
+    adler32_z
     crc32
+    crc32_z
     adler32_combine
     crc32_combine
 ; various hacks, don't look :)
@@ -81,6 +87,8 @@ EXPORTS
     inflateSyncPoint
     get_crc_table
     inflateUndermine
+    inflateValidate
+    inflateCodesUsed
     inflateResetKeep
     deflateResetKeep
     gzopen_w

compat/zlib/win32/zlib1.rc

@@ -26,7 +26,7 @@ BEGIN
       VALUE "FileDescription",	"zlib data compression library\0"
       VALUE "FileVersion",	ZLIB_VERSION "\0"
       VALUE "InternalName",	"zlib1.dll\0"
-      VALUE "LegalCopyright",	"(C) 1995-2013 Jean-loup Gailly & Mark Adler\0"
+      VALUE "LegalCopyright",	"(C) 1995-2017 Jean-loup Gailly & Mark Adler\0"
       VALUE "OriginalFilename",	"zlib1.dll\0"
       VALUE "ProductName",	"zlib\0"
       VALUE "ProductVersion",	ZLIB_VERSION "\0"