From: hansr <hk-git@circlestorm.org>
Date: Wed, 8 Oct 2014 12:19:05 +0000 (+0200)
Subject: Fix merge conflict between commits d948170 and 32de507
X-Git-Tag: 1.9.9-b1~932
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dede9760af0f540cff8a3cc4dd081111972e4694;p=thirdparty%2Fzlib-ng.git

Fix merge conflict between commits d948170 and 32de507
---

diff --git a/deflate.h b/deflate.h
index 28140d2ec..c4d0b8926 100644
--- a/deflate.h
+++ b/deflate.h
@@ -415,15 +415,6 @@ void ZLIB_INTERNAL bi_windup OF((deflate_state *s));
        send_bits(s, tree[c].Code, tree[c].Len); }
 #endif
 
-/* ===========================================================================
- * Output a short LSB first on the stream.
- * IN assertion: there is enough room in pendingBuf.
- */
-#define put_short(s, w) { \
-    put_byte(s, (uch)((w) & 0xff)); \
-    put_byte(s, (uch)((ush)(w) >> 8)); \
-}
-
 #ifdef DEBUG
 /* ===========================================================================
  * Send a value on a given number of bits.