Clean up the addition of inflateGetDictionary.

wxWidgets · Mar 24, 2013 · f0546c8 · f0546c8
1 parent 03ff48c
commit f0546c8
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 3 deletions.
diff --git a/as400/bndsrc b/as400/bndsrc
@@ -67,7 +67,6 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
   EXPORT SYMBOL("inflate")
   EXPORT SYMBOL("inflateEnd")
   EXPORT SYMBOL("inflateSetDictionary")
-  EXPORT SYMBOL("inflateGetDictionary")
   EXPORT SYMBOL("inflateSync")
   EXPORT SYMBOL("inflateReset")
   EXPORT SYMBOL("inflateInit_")
@@ -203,4 +202,14 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
 
   EXPORT SYMBOL("inflateResetKeep")
 
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+/*   Version 1.2.8 additional entry points.                         */
+/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
+
+/********************************************************************/
+/*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("inflateGetDictionary")
+
 ENDPGMEXP
diff --git a/contrib/vstudio/vc11/zlibvc11.def b/contrib/vstudio/vc11/zlibvc11.def
@@ -137,3 +137,6 @@ EXPORTS
 
 ; zlib1 v1.2.7 added:
         gzopen_w                                @165
+
+; zlib1 v1.2.8 added:
+        inflateGetDictionary                    @166
diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def
@@ -137,3 +137,6 @@ EXPORTS
 
 ; zlib1 v1.2.7 added:
         gzopen_w                                @165
+
+; zlib1 v1.2.8 added:
+        inflateGetDictionary                    @166
diff --git a/zlib.h b/zlib.h
@@ -850,7 +850,7 @@ ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
    Z_NULL, then only the dictionary length is returned, and nothing is copied.
    Similary, if dictLength is Z_NULL, then it is not set.
 
-     inflateSetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
+     inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
    stream state is inconsistent.
 */
 

diff --git a/zlib.map b/zlib.map
@@ -78,5 +78,5 @@ ZLIB_1.2.5.2 {
 } ZLIB_1.2.5.1;
 
 ZLIB_1.2.7.1 {
-    inflateSetDictionary;
+    inflateGetDictionary;
 } ZLIB_1.2.7;