(cherry-pick): Update zlib to version 1.2.9. Dll's and *.lib files not updated yet

3 files changed, 97 insertions, 89 deletions

diff --git a/compat/zlib/win32/Makefile.gcc b/compat/zlib/win32/Makefile.gcc
index 6d1ded6..305be50 100644
--- a/compat/zlib/win32/Makefile.gcc
+++ b/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
diff --git a/compat/zlib/win32/README-WIN32.txt b/compat/zlib/win32/README-WIN32.txt
index 3d77d52..5002f3c 100644
--- a/compat/zlib/win32/README-WIN32.txt
+++ b/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.9 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.9-win32-x86.zip will contain the following files:
 
   README-WIN32.txt This document
   ChangeLog        Changes since previous zlib packages
diff --git a/compat/zlib/win32/zlib.def b/compat/zlib/win32/zlib.def
index face655..784b138 100644
--- a/compat/zlib/win32/zlib.def
+++ b/compat/zlib/win32/zlib.def
@@ -1,86 +1,94 @@
-; zlib data compression library
-EXPORTS
-; basic functions
-    zlibVersion
-    deflate
-    deflateEnd
-    inflate
-    inflateEnd
-; advanced functions
-    deflateSetDictionary
-    deflateCopy
-    deflateReset
-    deflateParams
-    deflateTune
-    deflateBound
-    deflatePending
-    deflatePrime
-    deflateSetHeader
-    inflateSetDictionary
-    inflateGetDictionary
-    inflateSync
-    inflateCopy
-    inflateReset
-    inflateReset2
-    inflatePrime
-    inflateMark
-    inflateGetHeader
-    inflateBack
-    inflateBackEnd
-    zlibCompileFlags
-; utility functions
-    compress
-    compress2
-    compressBound
-    uncompress
-    gzopen
-    gzdopen
-    gzbuffer
-    gzsetparams
-    gzread
-    gzwrite
-    gzprintf
-    gzvprintf
-    gzputs
-    gzgets
-    gzputc
-    gzgetc
-    gzungetc
-    gzflush
-    gzseek
-    gzrewind
-    gztell
-    gzoffset
-    gzeof
-    gzdirect
-    gzclose
-    gzclose_r
-    gzclose_w
-    gzerror
-    gzclearerr
-; large file functions
-    gzopen64
-    gzseek64
-    gztell64
-    gzoffset64
-    adler32_combine64
-    crc32_combine64
-; checksum functions
-    adler32
-    crc32
-    adler32_combine
-    crc32_combine
-; various hacks, don't look :)
-    deflateInit_
-    deflateInit2_
-    inflateInit_
-    inflateInit2_
-    inflateBackInit_
-    gzgetc_
-    zError
-    inflateSyncPoint
-    get_crc_table
-    inflateUndermine
-    inflateResetKeep
-    deflateResetKeep
-    gzopen_w
+; zlib data compression library

+EXPORTS

+; basic functions

+    zlibVersion

+    deflate

+    deflateEnd

+    inflate

+    inflateEnd

+; advanced functions

+    deflateSetDictionary

+    deflateGetDictionary

+    deflateCopy

+    deflateReset

+    deflateParams

+    deflateTune

+    deflateBound

+    deflatePending

+    deflatePrime

+    deflateSetHeader

+    inflateSetDictionary

+    inflateGetDictionary

+    inflateSync

+    inflateCopy

+    inflateReset

+    inflateReset2

+    inflatePrime

+    inflateMark

+    inflateGetHeader

+    inflateBack

+    inflateBackEnd

+    zlibCompileFlags

+; utility functions

+    compress

+    compress2

+    compressBound

+    uncompress

+    uncompress2

+    gzopen

+    gzdopen

+    gzbuffer

+    gzsetparams

+    gzread

+    gzfread

+    gzwrite

+    gzfwrite

+    gzprintf

+    gzvprintf

+    gzputs

+    gzgets

+    gzputc

+    gzgetc

+    gzungetc

+    gzflush

+    gzseek

+    gzrewind

+    gztell

+    gzoffset

+    gzeof

+    gzdirect

+    gzclose

+    gzclose_r

+    gzclose_w

+    gzerror

+    gzclearerr

+; large file functions

+    gzopen64

+    gzseek64

+    gztell64

+    gzoffset64

+    adler32_combine64

+    crc32_combine64

+; checksum functions

+    adler32

+    adler32_z

+    crc32

+    crc32_z

+    adler32_combine

+    crc32_combine

+; various hacks, don't look :)

+    deflateInit_

+    deflateInit2_

+    inflateInit_

+    inflateInit2_

+    inflateBackInit_

+    gzgetc_

+    zError

+    inflateSyncPoint

+    get_crc_table

+    inflateUndermine

+    inflateValidate

+    inflateCodesUsed

+    inflateResetKeep

+    deflateResetKeep

+    gzopen_w