Restore gzgetc_ for backward compatibility with 1.2.6.

13 years ago · d81e7213b7
parent 6838df9246
commit d81e7213b7
11 changed files with 23 additions and 0 deletions
--- a/as400/bndsrc
+++ b/as400/bndsrc
@ -190,6 +190,12 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
  EXPORT SYMBOL("deflateResetKeep")
  EXPORT SYMBOL("deflatePending")

+/********************************************************************/
+/*   *MODULE      GZWRITE      ZLIB         01/02/01  00:15:09      */
+/********************************************************************/
+
+  EXPORT SYMBOL("gzgetc_")
+
 /********************************************************************/
 /*   *MODULE      INFLATE      ZLIB         01/02/01  00:15:09      */
 /********************************************************************/
--- a/as400/zlib.inc
+++ b/as400/zlib.inc
@ -187,6 +187,9 @@
     D  c                            10I 0 value                                Character to write
      *
     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 gzungetc        PR            10i 0 extproc('gzungetc')
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@ -131,5 +131,6 @@ EXPORTS
        inflateUndermine                        @160

 ; zlib1 v1.2.6 added:
+        gzgetc_                                 @161
        inflateResetKeep                        @163
 	deflateResetKeep			@164
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@ -131,5 +131,6 @@ EXPORTS
        inflateUndermine                        @160

 ; zlib1 v1.2.6 added:
+        gzgetc_                                 @161
        inflateResetKeep                        @163
 	deflateResetKeep			@164
--- a/gzread.c
+++ b/gzread.c
@ -408,6 +408,12 @@ int ZEXPORT gzgetc(file)
    return ret < 1 ? -1 : buf[0];
 }

+int ZEXPORT gzgetc_(file)
+gzFile file;
+{
+    return gzgetc(file);
+}
+
 /* -- see zlib.h -- */
 int ZEXPORT gzungetc(c, file)
    int c;
--- a/win32/zlib.def
+++ b/win32/zlib.def
@ -80,3 +80,4 @@ EXPORTS
    inflateUndermine
    inflateResetKeep
    deflateResetKeep
+    gzgetc_
--- a/zconf.h
+++ b/zconf.h
@ -67,6 +67,7 @@
 #    define gzerror               z_gzerror
 #    define gzflush               z_gzflush
 #    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
 #    define gzgets                z_gzgets
 #    define gzoffset              z_gzoffset
 #    define gzoffset64            z_gzoffset64
--- a/zconf.h.cmakein
+++ b/zconf.h.cmakein
@ -69,6 +69,7 @@
 #    define gzerror               z_gzerror
 #    define gzflush               z_gzflush
 #    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
 #    define gzgets                z_gzgets
 #    define gzoffset              z_gzoffset
 #    define gzoffset64            z_gzoffset64
--- a/zconf.h.in
+++ b/zconf.h.in
@ -67,6 +67,7 @@
 #    define gzerror               z_gzerror
 #    define gzflush               z_gzflush
 #    define gzgetc                z_gzgetc
+#    define gzgetc_               z_gzgetc_
 #    define gzgets                z_gzgets
 #    define gzoffset              z_gzoffset
 #    define gzoffset64            z_gzoffset64
--- a/zlib.h
+++ b/zlib.h
@ -1649,6 +1649,7 @@ struct gzFile_s {
    unsigned char *next;
    z_off64_t pos;
 };
+ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file));  /* backward compatibility */
 #ifdef Z_PREFIX_SET
 #  undef z_gzgetc
 #  define z_gzgetc(g) \
--- a/zlib.map
+++ b/zlib.map
@ -73,5 +73,6 @@ ZLIB_1.2.5.1 {

 ZLIB_1.2.5.2 {
    deflateResetKeep;
+    gzgetc_;
    inflateResetKeep;
 } ZLIB_1.2.5.1;