From: Mika Lindqvist <postmaster@raasu.org>
Date: Mon, 18 Apr 2016 16:13:28 +0000 (+0300)
Subject: Fix debug build.
X-Git-Tag: 1.9.9-b1~755
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=46d4d0cd449dc0711e2d302e373183fd114a3ee5;p=thirdparty%2Fzlib-ng.git

Fix debug build.
---

diff --git a/arch/x86/deflate_quick.c b/arch/x86/deflate_quick.c
index 68b5ddfa1..6fc5136ea 100644
--- a/arch/x86/deflate_quick.c
+++ b/arch/x86/deflate_quick.c
@@ -19,6 +19,10 @@
 #endif
 #include "deflate.h"
 
+#ifdef DEBUG
+#include <ctype.h>
+#endif
+
 extern void fill_window_sse(deflate_state *s);
 extern void flush_pending(z_stream *strm);
 
diff --git a/deflate.c b/deflate.c
index 0b392a1e5..de3f7e193 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1404,3 +1404,29 @@ static block_state deflate_huff(deflate_state *s, int flush) {
         FLUSH_BLOCK(s, 0);
     return block_done;
 }
+
+#ifdef DEBUG
+/* ===========================================================================
+ * Send a value on a given number of bits.
+ * IN assertion: length <= 16 and value fits in length bits.
+ */
+void send_bits(deflate_state *s, int value, int length) {
+    Tracevv((stderr, " l %2d v %4x ", length, value));
+    Assert(length > 0 && length <= 15, "invalid length");
+    s->bits_sent += (unsigned long)length;
+
+    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+     * unused bits in value.
+     */
+    if (s->bi_valid > (int)Buf_size - length) {
+        s->bi_buf |= (uint16_t)value << s->bi_valid;
+        put_short(s, s->bi_buf);
+        s->bi_buf = (uint16_t)value >> (Buf_size - s->bi_valid);
+        s->bi_valid += length - Buf_size;
+    } else {
+        s->bi_buf |= (uint16_t)value << s->bi_valid;
+        s->bi_valid += length;
+    }
+}
+#endif
diff --git a/deflate.h b/deflate.h
index f92c0d114..3711d0ba2 100644
--- a/deflate.h
+++ b/deflate.h
@@ -424,29 +424,7 @@ void ZLIB_INTERNAL bi_windup(deflate_state *s);
 #endif
 
 #ifdef DEBUG
-/* ===========================================================================
- * Send a value on a given number of bits.
- * IN assertion: length <= 16 and value fits in length bits.
- */
-local void send_bits(deflate_state *s, int value, int length) {
-    Tracevv((stderr, " l %2d v %4x ", length, value));
-    Assert(length > 0 && length <= 15, "invalid length");
-    s->bits_sent += (unsigned long)length;
-
-    /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-     * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-     * unused bits in value.
-     */
-    if (s->bi_valid > (int)Buf_size - length) {
-        s->bi_buf |= (uint16_t)value << s->bi_valid;
-        put_short(s, s->bi_buf);
-        s->bi_buf = (uint16_t)value >> (Buf_size - s->bi_valid);
-        s->bi_valid += length - Buf_size;
-    } else {
-        s->bi_buf |= (uint16_t)value << s->bi_valid;
-        s->bi_valid += length;
-    }
-}
+void send_bits(deflate_state *s, int value, int length);
 #else
 #define send_bits(s, value, length) \
 { int len = length;\