summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2013-03-23 22:57:27 -0700
committerMark Adler <madler@alumni.caltech.edu>2013-03-23 23:32:58 -0700
commitf0546c8e34dbe1bcc636a6ab4529159266efafe6 (patch)
tree44101aef0f1080fc047691b8cfc8ea61d0dfd368
parent03ff48cc67937fbb026a7952c0351615ef9be4e5 (diff)
downloadzlib-f0546c8e34dbe1bcc636a6ab4529159266efafe6.tar.gz
zlib-f0546c8e34dbe1bcc636a6ab4529159266efafe6.tar.bz2
zlib-f0546c8e34dbe1bcc636a6ab4529159266efafe6.zip
Clean up the addition of inflateGetDictionary.
-rw-r--r--as400/bndsrc11
-rw-r--r--contrib/vstudio/vc11/zlibvc11.def3
-rw-r--r--contrib/vstudio/vc12/zlibvc.def3
-rw-r--r--zlib.h2
-rw-r--r--zlib.map2
5 files changed, 18 insertions, 3 deletions
diff --git a/as400/bndsrc b/as400/bndsrc
index a6de4d5..98814fd 100644
--- a/as400/bndsrc
+++ b/as400/bndsrc
@@ -67,7 +67,6 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
67 EXPORT SYMBOL("inflate") 67 EXPORT SYMBOL("inflate")
68 EXPORT SYMBOL("inflateEnd") 68 EXPORT SYMBOL("inflateEnd")
69 EXPORT SYMBOL("inflateSetDictionary") 69 EXPORT SYMBOL("inflateSetDictionary")
70 EXPORT SYMBOL("inflateGetDictionary")
71 EXPORT SYMBOL("inflateSync") 70 EXPORT SYMBOL("inflateSync")
72 EXPORT SYMBOL("inflateReset") 71 EXPORT SYMBOL("inflateReset")
73 EXPORT SYMBOL("inflateInit_") 72 EXPORT SYMBOL("inflateInit_")
@@ -203,4 +202,14 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
203 202
204 EXPORT SYMBOL("inflateResetKeep") 203 EXPORT SYMBOL("inflateResetKeep")
205 204
205/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
206/* Version 1.2.8 additional entry points. */
207/*@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@*/
208
209/********************************************************************/
210/* *MODULE INFLATE ZLIB 01/02/01 00:15:09 */
211/********************************************************************/
212
213 EXPORT SYMBOL("inflateGetDictionary")
214
206ENDPGMEXP 215ENDPGMEXP
diff --git a/contrib/vstudio/vc11/zlibvc11.def b/contrib/vstudio/vc11/zlibvc11.def
index 3adee3c..08e3dea 100644
--- a/contrib/vstudio/vc11/zlibvc11.def
+++ b/contrib/vstudio/vc11/zlibvc11.def
@@ -137,3 +137,6 @@ EXPORTS
137 137
138; zlib1 v1.2.7 added: 138; zlib1 v1.2.7 added:
139 gzopen_w @165 139 gzopen_w @165
140
141; zlib1 v1.2.8 added:
142 inflateGetDictionary @166
diff --git a/contrib/vstudio/vc12/zlibvc.def b/contrib/vstudio/vc12/zlibvc.def
index 3adee3c..08e3dea 100644
--- a/contrib/vstudio/vc12/zlibvc.def
+++ b/contrib/vstudio/vc12/zlibvc.def
@@ -137,3 +137,6 @@ EXPORTS
137 137
138; zlib1 v1.2.7 added: 138; zlib1 v1.2.7 added:
139 gzopen_w @165 139 gzopen_w @165
140
141; zlib1 v1.2.8 added:
142 inflateGetDictionary @166
diff --git a/zlib.h b/zlib.h
index e3f11eb..7ae67a1 100644
--- a/zlib.h
+++ b/zlib.h
@@ -850,7 +850,7 @@ ZEXTERN int ZEXPORT inflateGetDictionary OF((z_streamp strm,
850 Z_NULL, then only the dictionary length is returned, and nothing is copied. 850 Z_NULL, then only the dictionary length is returned, and nothing is copied.
851 Similary, if dictLength is Z_NULL, then it is not set. 851 Similary, if dictLength is Z_NULL, then it is not set.
852 852
853 inflateSetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the 853 inflateGetDictionary returns Z_OK on success, or Z_STREAM_ERROR if the
854 stream state is inconsistent. 854 stream state is inconsistent.
855*/ 855*/
856 856
diff --git a/zlib.map b/zlib.map
index d7b4df7..9704371 100644
--- a/zlib.map
+++ b/zlib.map
@@ -78,5 +78,5 @@ ZLIB_1.2.5.2 {
78} ZLIB_1.2.5.1; 78} ZLIB_1.2.5.1;
79 79
80ZLIB_1.2.7.1 { 80ZLIB_1.2.7.1 {
81 inflateSetDictionary; 81 inflateGetDictionary;
82} ZLIB_1.2.7; 82} ZLIB_1.2.7;