Restore gzgetc_ for backward compatibility with 1.2.6.

pull/3/head^2
Mark Adler 13 years ago
parent 6838df9246
commit d81e7213b7
  1. 6
      as400/bndsrc
  2. 3
      as400/zlib.inc
  3. 1
      contrib/vstudio/vc10/zlibvc.def
  4. 1
      contrib/vstudio/vc9/zlibvc.def
  5. 6
      gzread.c
  6. 1
      win32/zlib.def
  7. 1
      zconf.h
  8. 1
      zconf.h.cmakein
  9. 1
      zconf.h.in
  10. 1
      zlib.h
  11. 1
      zlib.map

@ -190,6 +190,12 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
EXPORT SYMBOL("deflateResetKeep") EXPORT SYMBOL("deflateResetKeep")
EXPORT SYMBOL("deflatePending") EXPORT SYMBOL("deflatePending")
/********************************************************************/
/* *MODULE GZWRITE ZLIB 01/02/01 00:15:09 */
/********************************************************************/
EXPORT SYMBOL("gzgetc_")
/********************************************************************/ /********************************************************************/
/* *MODULE INFLATE ZLIB 01/02/01 00:15:09 */ /* *MODULE INFLATE ZLIB 01/02/01 00:15:09 */
/********************************************************************/ /********************************************************************/

@ -187,6 +187,9 @@
D c 10I 0 value Character to write D c 10I 0 value Character to write
* *
D gzgetc PR 10i 0 extproc('gzgetc') D gzgetc PR 10i 0 extproc('gzgetc')
D file value like(gzFile) File pointer
*
D gzgetc_ PR 10i 0 extproc('gzgetc_')
D file value like(gzFile) File pointer D file value like(gzFile) File pointer
* *
D gzungetc PR 10i 0 extproc('gzungetc') D gzungetc PR 10i 0 extproc('gzungetc')

@ -131,5 +131,6 @@ EXPORTS
inflateUndermine @160 inflateUndermine @160
; zlib1 v1.2.6 added: ; zlib1 v1.2.6 added:
gzgetc_ @161
inflateResetKeep @163 inflateResetKeep @163
deflateResetKeep @164 deflateResetKeep @164

@ -131,5 +131,6 @@ EXPORTS
inflateUndermine @160 inflateUndermine @160
; zlib1 v1.2.6 added: ; zlib1 v1.2.6 added:
gzgetc_ @161
inflateResetKeep @163 inflateResetKeep @163
deflateResetKeep @164 deflateResetKeep @164

@ -408,6 +408,12 @@ int ZEXPORT gzgetc(file)
return ret < 1 ? -1 : buf[0]; return ret < 1 ? -1 : buf[0];
} }
int ZEXPORT gzgetc_(file)
gzFile file;
{
return gzgetc(file);
}
/* -- see zlib.h -- */ /* -- see zlib.h -- */
int ZEXPORT gzungetc(c, file) int ZEXPORT gzungetc(c, file)
int c; int c;

@ -80,3 +80,4 @@ EXPORTS
inflateUndermine inflateUndermine
inflateResetKeep inflateResetKeep
deflateResetKeep deflateResetKeep
gzgetc_

@ -67,6 +67,7 @@
# define gzerror z_gzerror # define gzerror z_gzerror
# define gzflush z_gzflush # define gzflush z_gzflush
# define gzgetc z_gzgetc # define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_
# define gzgets z_gzgets # define gzgets z_gzgets
# define gzoffset z_gzoffset # define gzoffset z_gzoffset
# define gzoffset64 z_gzoffset64 # define gzoffset64 z_gzoffset64

@ -69,6 +69,7 @@
# define gzerror z_gzerror # define gzerror z_gzerror
# define gzflush z_gzflush # define gzflush z_gzflush
# define gzgetc z_gzgetc # define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_
# define gzgets z_gzgets # define gzgets z_gzgets
# define gzoffset z_gzoffset # define gzoffset z_gzoffset
# define gzoffset64 z_gzoffset64 # define gzoffset64 z_gzoffset64

@ -67,6 +67,7 @@
# define gzerror z_gzerror # define gzerror z_gzerror
# define gzflush z_gzflush # define gzflush z_gzflush
# define gzgetc z_gzgetc # define gzgetc z_gzgetc
# define gzgetc_ z_gzgetc_
# define gzgets z_gzgets # define gzgets z_gzgets
# define gzoffset z_gzoffset # define gzoffset z_gzoffset
# define gzoffset64 z_gzoffset64 # define gzoffset64 z_gzoffset64

@ -1649,6 +1649,7 @@ struct gzFile_s {
unsigned char *next; unsigned char *next;
z_off64_t pos; z_off64_t pos;
}; };
ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */
#ifdef Z_PREFIX_SET #ifdef Z_PREFIX_SET
# undef z_gzgetc # undef z_gzgetc
# define z_gzgetc(g) \ # define z_gzgetc(g) \

@ -73,5 +73,6 @@ ZLIB_1.2.5.1 {
ZLIB_1.2.5.2 { ZLIB_1.2.5.2 {
deflateResetKeep; deflateResetKeep;
gzgetc_;
inflateResetKeep; inflateResetKeep;
} ZLIB_1.2.5.1; } ZLIB_1.2.5.1;

Loading…
Cancel
Save