Restore gzgetc function for binary compatibility.

Newly compiled applications will use the gzgetc macro.

diff --git a/as400/bndsrc b/as400/bndsrc
index 3e26283debdf07ef837f1f3ec48bbf4ec70d48c7..a7df67bbfd71c34cbf5d8a926281be3ce48b83f8 100644 (file)
--- a/as400/bndsrc
+++ b/as400/bndsrc
@@ -53,6 +53,7 @@ STRPGMEXP PGMLVL(*CURRENT) SIGNATURE('ZLIB')
   EXPORT SYMBOL("gzputs")
   EXPORT SYMBOL("gzgets")
   EXPORT SYMBOL("gzputc")
+  EXPORT SYMBOL("gzgetc")
   EXPORT SYMBOL("gzflush")
   EXPORT SYMBOL("gzseek")
   EXPORT SYMBOL("gzrewind")

diff --git a/as400/zlib.inc b/as400/zlib.inc
index d710e13d13c689c55dba3ad4c2bfbdb16bfc23aa..20e32282860a2984a1f5dcbb38e428df63328b04 100644 (file)
--- a/as400/zlib.inc
+++ b/as400/zlib.inc
@@ -186,6 +186,9 @@
      D  file                               value like(gzFile)                   File pointer
      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
       *

diff --git a/contrib/vstudio/vc10/zlibvc.def b/contrib/vstudio/vc10/zlibvc.def
index 5521885454a1b9a05abe6e2e3852a18075374d58..6bc1e6024f9fe91bde86184006538657ecfc4f88 100644 (file)
--- a/contrib/vstudio/vc10/zlibvc.def
+++ b/contrib/vstudio/vc10/zlibvc.def
@@ -33,6 +33,7 @@ EXPORTS
         zlibVersion                              @27\r
         gzprintf                                 @28\r
         gzputc                                   @29\r
+        gzgetc                                   @30\r
         gzseek                                   @31\r
         gzrewind                                 @32\r
         gztell                                   @33\r

diff --git a/contrib/vstudio/vc9/zlibvc.def b/contrib/vstudio/vc9/zlibvc.def
index 5521885454a1b9a05abe6e2e3852a18075374d58..6bc1e6024f9fe91bde86184006538657ecfc4f88 100644 (file)
--- a/contrib/vstudio/vc9/zlibvc.def
+++ b/contrib/vstudio/vc9/zlibvc.def
@@ -33,6 +33,7 @@ EXPORTS
         zlibVersion                              @27\r
         gzprintf                                 @28\r
         gzputc                                   @29\r
+        gzgetc                                   @30\r
         gzseek                                   @31\r
         gzrewind                                 @32\r
         gztell                                   @33\r

diff --git a/gzread.c b/gzread.c
index 09e586366fc7edf9db6ca1d512e72a4eb78f8fa8..46d40e0bb8d2982145e97729d320be4959e86189 100644 (file)
--- a/gzread.c
+++ b/gzread.c
@@ -390,10 +390,7 @@ int ZEXPORT gzgetc_(file)
         (state->err != Z_OK && state->err != Z_BUF_ERROR))
         return -1;
 
-    /* try output buffer (no need to check for skip request) -- while
-       this check really isn't required since the gzgetc() macro has
-       already determined that x.have is zero, we leave it in for
-       completeness. */
+    /* try output buffer (no need to check for skip request) */
     if (state->x.have) {
         state->x.have--;
         state->x.pos++;
@@ -405,6 +402,13 @@ int ZEXPORT gzgetc_(file)
     return ret < 1 ? -1 : buf[0];
 }
 
+#undef gzgetc
+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 21bff1f8a8d1b3ab239b5501447c58e85b01e2b8..d96c18ae45d681fdb7e0be8183c117b12290ae5d 100644 (file)
--- a/win32/zlib.def
+++ b/win32/zlib.def
@@ -42,6 +42,7 @@ EXPORTS
     gzputs
     gzgets
     gzputc
+    gzgetc
     gzungetc
     gzflush
     gzseek

diff --git a/zlib.h b/zlib.h
index 4364ccfcec594f35856360129cc4a77085f41ea2..9ca20d73f5d3dacd8aba0697a41e0bf49049deda 100644 (file)
--- a/zlib.h
+++ b/zlib.h
@@ -1363,8 +1363,8 @@ ZEXTERN int ZEXPORT gzputc OF((gzFile file, int c));
    returns the value that was written, or -1 in case of error.
 */
 
-/*
 ZEXTERN int ZEXPORT gzgetc OF((gzFile file));
+/*
      Reads one byte from the compressed file.  gzgetc returns this byte or -1
    in case of end of file or error.  This is implemented as a macro for speed.
    As such, it does not do all of the checking the other functions do.  I.e.