Fix merge conflict between commits d306c75 and 2c888ab

diff --git a/deflate.c b/deflate.c
index ba7235b5a436c35adf2aeb4725e521418e2ad641..5a44b49904e2c67f161bd5e364c5054364a88e05 100644 (file)
--- 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