zlib 1.2.12v1.2.12

2 files changed, 5 insertions, 2 deletions

diff --git a/win32/README-WIN32.txt b/win32/README-WIN32.txt
index a1de359..536cfec 100644
--- a/win32/README-WIN32.txt
+++ b/win32/README-WIN32.txt
@@ -1,6 +1,6 @@
 ZLIB DATA COMPRESSION LIBRARY
 
-zlib 1.2.11.1 is a general purpose data compression library.  All the code is
+zlib 1.2.12 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.11.1-win32-x86.zip will contain the following files:
+The package zlib-1.2.12-win32-x86.zip will contain the following files:
 
   README-WIN32.txt This document
   ChangeLog        Changes since previous zlib packages
diff --git a/win32/zlib.def b/win32/zlib.def
index 784b138..53c8011 100644
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -69,6 +69,7 @@ EXPORTS
     gzoffset64

     adler32_combine64

     crc32_combine64

+    crc32_combine_gen64

 ; checksum functions

     adler32

     adler32_z

@@ -76,6 +77,8 @@ EXPORTS
     crc32_z

     adler32_combine

     crc32_combine

+    crc32_combine_gen

+    crc32_combine_op

 ; various hacks, don't look :)

     deflateInit_

     deflateInit2_