From: mickey <mickey@openbsd.org>
Date: Fri, 7 Feb 1997 13:26:31 +0000 (+0000)
Subject: s/DEBUG/DEBUG_ZLIB/g
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1448a6dcef16b1624441c8626386171671680ff1;p=openbsd

s/DEBUG/DEBUG_ZLIB/g
---

diff --git a/sys/lib/libz/infblock.c b/sys/lib/libz/infblock.c
index cc2e6745a78..a57122a7968 100644
--- a/sys/lib/libz/infblock.c
+++ b/sys/lib/libz/infblock.c
@@ -110,7 +110,7 @@ uInt w;
 }
 
 
-#ifdef DEBUG
+#ifdef DEBUG_ZLIB
   extern uInt inflate_hufts;
 #endif
 int inflate_blocks(s, z, r)
@@ -309,7 +309,7 @@ int r;
         bl = 9;         /* must be <= 9 for lookahead assumptions */
         bd = 6;         /* must be <= 9 for lookahead assumptions */
         t = s->sub.trees.table;
-#ifdef DEBUG
+#ifdef DEBUG_ZLIB
       inflate_hufts = 0;
 #endif
         t = inflate_trees_dynamic(257 + (t & 0x1f), 1 + ((t >> 5) & 0x1f),
diff --git a/sys/lib/libz/inftrees.c b/sys/lib/libz/inftrees.c
index 90205bd1e57..39a9dd400d2 100644
--- a/sys/lib/libz/inftrees.c
+++ b/sys/lib/libz/inftrees.c
@@ -91,7 +91,7 @@ local uInt cpdext[30] = { /* Extra bits for distance codes */
 #define BMAX 15         /* maximum bit length of any code */
 #define N_MAX 288       /* maximum number of codes in any set */
 
-#ifdef DEBUG
+#ifdef DEBUG_ZLIB
   uInt inflate_hufts;
 #endif
 
@@ -239,7 +239,7 @@ z_streamp zs;           /* for zalloc function */
             inflate_trees_free(u[0], zs);
           return Z_MEM_ERROR;   /* not enough memory */
         }
-#ifdef DEBUG
+#ifdef DEBUG_ZLIB
         inflate_hufts += z + 1;
 #endif
         *t = q + 1;             /* link to list for huft_free() */
diff --git a/sys/lib/libz/inftrees.h b/sys/lib/libz/inftrees.h
index b06613ddd3f..1991804a4ef 100644
--- a/sys/lib/libz/inftrees.h
+++ b/sys/lib/libz/inftrees.h
@@ -27,7 +27,7 @@ struct inflate_huft_s {
   } more;
 };
 
-#ifdef DEBUG
+#ifdef DEBUG_ZLIB
   extern uInt inflate_hufts;
 #endif
 
diff --git a/sys/lib/libz/zutil.h b/sys/lib/libz/zutil.h
index 7e8e1f246bd..e171b982d52 100644
--- a/sys/lib/libz/zutil.h
+++ b/sys/lib/libz/zutil.h
@@ -8,7 +8,7 @@
    subject to change. Applications should only use zlib.h.
  */
 
-/* $Id: zutil.h,v 1.1 1997/02/06 02:56:56 downsj Exp $ */
+/* $Id: zutil.h,v 1.2 1997/02/07 13:26:33 mickey Exp $ */
 
 #ifndef _Z_UTIL_H
 #define _Z_UTIL_H
@@ -168,7 +168,7 @@ extern const char *z_errmsg[10]; /* indexed by 2-zlib_error */
 #endif
 
 /* Diagnostic functions */
-#ifdef DEBUG
+#ifdef DEBUG_ZLIB
 #  include <stdio.h>
 #  ifndef verbose
 #    define verbose 0