Restore gzgetc_ for backward compatibility with 1.2.6.

diff --git a/as400/bndsrc b/as400/bndsrc
index da6eaa6ef859409f466f6e15f7d79e400732f27b..52cc6613b30a939fadc73d9dd377b7f5e12a00b2 100644 (file)
--- 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      */
 /********************************************************************/

diff --git a/as400/zlib.inc b/as400/zlib.inc
index e22ee4f71b6c014af2e998a4fa9950b4113002fb..747c598aa05daa7630c4099a8c2d18f55bea2409 100644 (file)
--- 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')

diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index d6411fd65129711e5c53441167000b466d779f9e..b4bb8f615cdd76eb935cbdfd04987006a411da0b 100644 (file)
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -131,5 +131,6 @@ EXPORTS
         inflateUndermine                        @160\r
 \r
 ; zlib1 v1.2.6 added:\r
+        gzgetc_                                 @161\r
         inflateResetKeep                        @163\r
        deflateResetKeep                        @164

diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index d6411fd65129711e5c53441167000b466d779f9e..b4bb8f615cdd76eb935cbdfd04987006a411da0b 100644 (file)
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -131,5 +131,6 @@ EXPORTS
         inflateUndermine                        @160\r
 \r
 ; zlib1 v1.2.6 added:\r
+        gzgetc_                                 @161\r
         inflateResetKeep                        @163\r
        deflateResetKeep                        @164

diff --git a/gzread.c b/gzread.c
index 88807c98e62f1f1a1b8323585fa330aafb9dabe5..3493d34d4ea62cae85bf7628619dec94f25fdb46 100644 (file)
--- 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;

diff --git a/win32/zlib.def b/win32/zlib.def
index 4004ce9bf1bcb05cca34fc35ca99b54118deb9c5..a2a2081c3f5fe43ddd9fb75b3d6780ae86d7fd11 100644 (file)
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -80,3 +80,4 @@ EXPORTS
     inflateUndermine
     inflateResetKeep
     deflateResetKeep
+    gzgetc_

diff --git a/zconf.h b/zconf.h
index 2f91b975aab0d3716ba27224eeeb59aeb673af19..7f705dfb88374a815d2d859e7e146f19a0e69740 100644 (file)
--- 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

diff --git a/zconf.h.cmakein b/zconf.h.cmakein
index a7a4f6994697f2b9977b5468ef94b4cf1fedaa3a..9510eabdaa47693cb012dac49388f5c7201aaca7 100644 (file)
--- 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

diff --git a/zconf.h.in b/zconf.h.in
index 2f91b975aab0d3716ba27224eeeb59aeb673af19..7f705dfb88374a815d2d859e7e146f19a0e69740 100644 (file)
--- 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

diff --git a/zlib.h b/zlib.h
index 1ad592f0864f6bf96b16dd7786b71e626a3563a7..2cbd98182429745fe5db5bb4e602469cc90f1a91 100644 (file)
--- 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) \

diff --git a/zlib.map b/zlib.map
index e3bddd63ef618a1d9711b0b1aa5d3c145c54042f..771f420412e2162ac6c9c9aefc1c3d4b15a713f5 100644 (file)
--- 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;