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

Fix merge conflict between commits d306c75 and 2c888ab
---

diff --git a/deflate.c b/deflate.c
index ba7235b5a..5a44b4990 100644
--- a/deflate.c
+++ b/deflate.c
@@ -241,8 +241,7 @@ __attribute__ ((always_inline)) local void
 bulk_insert_str(deflate_state *s, Pos startpos, uInt count) {
     uInt idx;
     for (idx = 0; idx < count; idx++) {
-        Posf dummy;
-        INSERT_STRING(s, startpos + idx, dummy);
+        insert_string(s, startpos + idx);
     }
 }
 #endif