Fix merge conflict between commits d948170 and 32de507

diff --git a/deflate.h b/deflate.h
index 28140d2ec67e1e1a6bd423ea176abd9b287dbdb3..c4d0b8926701378e45b7e3d28720214a6f812b7e 100644 (file)
--- 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.