Restore gzgetc_ for backward compatibility with 1.2.6.

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')
   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 e22ee4f..747c598 100644
--- a/as400/zlib.inc
+++ b/as400/zlib.inc
@@ -189,6 +189,9 @@
      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')
      D  c                            10I 0 value                                Character to push
      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
         inflateUndermine                        @160

 

 ; zlib1 v1.2.6 added:

+        gzgetc_                                 @161

         inflateResetKeep                        @163

         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
         inflateUndermine                        @160

 

 ; zlib1 v1.2.6 added:

+        gzgetc_                                 @161

         inflateResetKeep                        @163

         deflateResetKeep                        @164
diff --git a/gzread.c b/gzread.c
index 88807c9..3493d34 100644
--- 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 4004ce9..a2a2081 100644
--- 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 2f91b97..7f705df 100644
--- 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 a7a4f69..9510eab 100644
--- 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 2f91b97..7f705df 100644
--- 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 1ad592f..2cbd981 100644
--- 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 e3bddd6..771f420 100644
--- 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;