diff options
-rw-r--r-- | as400/bndsrc | 6 | ||||
-rw-r--r-- | as400/zlib.inc | 3 | ||||
-rw-r--r-- | contrib/vstudio/vc10/zlibvc.def | 1 | ||||
-rw-r--r-- | contrib/vstudio/vc9/zlibvc.def | 1 | ||||
-rw-r--r-- | gzread.c | 6 | ||||
-rw-r--r-- | win32/zlib.def | 1 | ||||
-rw-r--r-- | zconf.h | 1 | ||||
-rw-r--r-- | zconf.h.cmakein | 1 | ||||
-rw-r--r-- | zconf.h.in | 1 | ||||
-rw-r--r-- | zlib.h | 1 | ||||
-rw-r--r-- | zlib.map | 1 |
11 files changed, 23 insertions, 0 deletions
diff --git a/as400/bndsrc b/as400/bndsrc index da6eaa6..52cc661 100644 --- a/as400/bndsrc +++ b/as400/bndsrc | |||
@@ -191,6 +191,12 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB') | |||
191 | EXPORT SYMBOL("deflatePending") | 191 | EXPORT SYMBOL("deflatePending") |
192 | 192 | ||
193 | /********************************************************************/ | 193 | /********************************************************************/ |
194 | /* *MODULE GZWRITE ZLIB 01/02/01 00:15:09 */ | ||
195 | /********************************************************************/ | ||
196 | |||
197 | EXPORT SYMBOL("gzgetc_") | ||
198 | |||
199 | /********************************************************************/ | ||
194 | /* *MODULE INFLATE ZLIB 01/02/01 00:15:09 */ | 200 | /* *MODULE INFLATE ZLIB 01/02/01 00:15:09 */ |
195 | /********************************************************************/ | 201 | /********************************************************************/ |
196 | 202 | ||
diff --git a/as400/zlib.inc b/as400/zlib.inc index e22ee4f..747c598 100644 --- a/as400/zlib.inc +++ b/as400/zlib.inc | |||
@@ -189,6 +189,9 @@ | |||
189 | D gzgetc PR 10i 0 extproc('gzgetc') | 189 | D gzgetc PR 10i 0 extproc('gzgetc') |
190 | D file value like(gzFile) File pointer | 190 | D file value like(gzFile) File pointer |
191 | * | 191 | * |
192 | D gzgetc_ PR 10i 0 extproc('gzgetc_') | ||
193 | D file value like(gzFile) File pointer | ||
194 | * | ||
192 | D gzungetc PR 10i 0 extproc('gzungetc') | 195 | D gzungetc PR 10i 0 extproc('gzungetc') |
193 | D c 10I 0 value Character to push | 196 | D c 10I 0 value Character to push |
194 | D file value like(gzFile) File pointer | 197 | D file value like(gzFile) File pointer |
diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def index d6411fd..b4bb8f6 100644 --- a/contrib/vstudio/vc10/zlibvc.def +++ b/contrib/vstudio/vc10/zlibvc.def | |||
@@ -131,5 +131,6 @@ EXPORTS | |||
131 | inflateUndermine @160 | 131 | inflateUndermine @160 |
132 | 132 | ||
133 | ; zlib1 v1.2.6 added: | 133 | ; zlib1 v1.2.6 added: |
134 | gzgetc_ @161 | ||
134 | inflateResetKeep @163 | 135 | inflateResetKeep @163 |
135 | deflateResetKeep @164 | 136 | deflateResetKeep @164 |
diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def index d6411fd..b4bb8f6 100644 --- a/contrib/vstudio/vc9/zlibvc.def +++ b/contrib/vstudio/vc9/zlibvc.def | |||
@@ -131,5 +131,6 @@ EXPORTS | |||
131 | inflateUndermine @160 | 131 | inflateUndermine @160 |
132 | 132 | ||
133 | ; zlib1 v1.2.6 added: | 133 | ; zlib1 v1.2.6 added: |
134 | gzgetc_ @161 | ||
134 | inflateResetKeep @163 | 135 | inflateResetKeep @163 |
135 | deflateResetKeep @164 | 136 | deflateResetKeep @164 |
@@ -408,6 +408,12 @@ int ZEXPORT gzgetc(file) | |||
408 | return ret < 1 ? -1 : buf[0]; | 408 | return ret < 1 ? -1 : buf[0]; |
409 | } | 409 | } |
410 | 410 | ||
411 | int ZEXPORT gzgetc_(file) | ||
412 | gzFile file; | ||
413 | { | ||
414 | return gzgetc(file); | ||
415 | } | ||
416 | |||
411 | /* -- see zlib.h -- */ | 417 | /* -- see zlib.h -- */ |
412 | int ZEXPORT gzungetc(c, file) | 418 | int ZEXPORT gzungetc(c, file) |
413 | int c; | 419 | int c; |
diff --git a/win32/zlib.def b/win32/zlib.def index 4004ce9..a2a2081 100644 --- a/win32/zlib.def +++ b/win32/zlib.def | |||
@@ -80,3 +80,4 @@ EXPORTS | |||
80 | inflateUndermine | 80 | inflateUndermine |
81 | inflateResetKeep | 81 | inflateResetKeep |
82 | deflateResetKeep | 82 | deflateResetKeep |
83 | gzgetc_ | ||
@@ -67,6 +67,7 @@ | |||
67 | # define gzerror z_gzerror | 67 | # define gzerror z_gzerror |
68 | # define gzflush z_gzflush | 68 | # define gzflush z_gzflush |
69 | # define gzgetc z_gzgetc | 69 | # define gzgetc z_gzgetc |
70 | # define gzgetc_ z_gzgetc_ | ||
70 | # define gzgets z_gzgets | 71 | # define gzgets z_gzgets |
71 | # define gzoffset z_gzoffset | 72 | # define gzoffset z_gzoffset |
72 | # define gzoffset64 z_gzoffset64 | 73 | # define gzoffset64 z_gzoffset64 |
diff --git a/zconf.h.cmakein b/zconf.h.cmakein index a7a4f69..9510eab 100644 --- a/zconf.h.cmakein +++ b/zconf.h.cmakein | |||
@@ -69,6 +69,7 @@ | |||
69 | # define gzerror z_gzerror | 69 | # define gzerror z_gzerror |
70 | # define gzflush z_gzflush | 70 | # define gzflush z_gzflush |
71 | # define gzgetc z_gzgetc | 71 | # define gzgetc z_gzgetc |
72 | # define gzgetc_ z_gzgetc_ | ||
72 | # define gzgets z_gzgets | 73 | # define gzgets z_gzgets |
73 | # define gzoffset z_gzoffset | 74 | # define gzoffset z_gzoffset |
74 | # define gzoffset64 z_gzoffset64 | 75 | # define gzoffset64 z_gzoffset64 |
@@ -67,6 +67,7 @@ | |||
67 | # define gzerror z_gzerror | 67 | # define gzerror z_gzerror |
68 | # define gzflush z_gzflush | 68 | # define gzflush z_gzflush |
69 | # define gzgetc z_gzgetc | 69 | # define gzgetc z_gzgetc |
70 | # define gzgetc_ z_gzgetc_ | ||
70 | # define gzgets z_gzgets | 71 | # define gzgets z_gzgets |
71 | # define gzoffset z_gzoffset | 72 | # define gzoffset z_gzoffset |
72 | # define gzoffset64 z_gzoffset64 | 73 | # define gzoffset64 z_gzoffset64 |
@@ -1649,6 +1649,7 @@ struct gzFile_s { | |||
1649 | unsigned char *next; | 1649 | unsigned char *next; |
1650 | z_off64_t pos; | 1650 | z_off64_t pos; |
1651 | }; | 1651 | }; |
1652 | ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ | ||
1652 | #ifdef Z_PREFIX_SET | 1653 | #ifdef Z_PREFIX_SET |
1653 | # undef z_gzgetc | 1654 | # undef z_gzgetc |
1654 | # define z_gzgetc(g) \ | 1655 | # define z_gzgetc(g) \ |
@@ -73,5 +73,6 @@ ZLIB_1.2.5.1 { | |||
73 | 73 | ||
74 | ZLIB_1.2.5.2 { | 74 | ZLIB_1.2.5.2 { |
75 | deflateResetKeep; | 75 | deflateResetKeep; |
76 | gzgetc_; | ||
76 | inflateResetKeep; | 77 | inflateResetKeep; |
77 | } ZLIB_1.2.5.1; | 78 | } ZLIB_1.2.5.1; |