[master] 1478588 More libvgz neutering

[Poul-Henning Kamp]

commit 1478588525251ad0afb602781d2801e1e2d25d98
Author: Poul-Henning Kamp <phk at FreeBSD.org>
Date:   Sun May 21 20:57:49 2017 +0000

    More libvgz neutering

diff --git a/lib/libvgz/deflate.c b/lib/libvgz/deflate.c
index 17c2016..ba50571 100644
--- a/lib/libvgz/deflate.c
+++ b/lib/libvgz/deflate.c
@@ -229,6 +229,8 @@ local void slide_hash(s)
 #endif
 }
 
+#ifdef NOVGZ
+
 /* ========================================================================= */
 int ZEXPORT deflateInit_(strm, level, version, stream_size)
     z_streamp strm;
@@ -241,6 +243,8 @@ int ZEXPORT deflateInit_(strm, level, version, stream_size)
     /* To do: ignore strm->next_in if we use it as window */
 }
 
+#endif
+
 /* ========================================================================= */
 int ZEXPORT deflateInit2_(strm, level, method, windowBits, memLevel, strategy,
                   version, stream_size)
@@ -1114,6 +1118,8 @@ int ZEXPORT deflateEnd (strm)
     return status == BUSY_STATE ? Z_DATA_ERROR : Z_OK;
 }
 
+#ifdef NOVGZ 
+
 /* =========================================================================
  * Copy the source state to the destination state.
  * To simplify the source, this is not supported for 16-bit MSDOS (which
@@ -1174,6 +1180,8 @@ int ZEXPORT deflateCopy (dest, source)
 #endif /* MAXSEG_64K */
 }
 
+#endif
+
 /* ===========================================================================
  * Read a new buffer from the current input stream, update the adler32
  * and total number of bytes read.  All deflate() input goes through
diff --git a/lib/libvgz/inflate.c b/lib/libvgz/inflate.c
index fdefc73..ca7b608 100644
--- a/lib/libvgz/inflate.c
+++ b/lib/libvgz/inflate.c
@@ -239,6 +239,8 @@ int stream_size;
     return ret;
 }
 
+#ifdef NOVGZ
+
 int ZEXPORT inflateInit_(strm, version, stream_size)
 z_streamp strm;
 const char *version;
@@ -268,6 +270,8 @@ int value;
     return Z_OK;
 }
 
+#endif
+
 /*
    Return state with length and distance decoding tables and index sizes set to
    fixed code decoding.  Normally this returns fixed tables from inffixed.h.