summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhansr <hk-git@circlestorm.org>2014-10-08 14:16:38 +0200
committerhansr <hk-git@circlestorm.org>2014-10-08 14:16:38 +0200
commit80e06ecf90c1f062359dd16ab0417424c705546d (patch)
tree62453d42852e6bb7bc06e6ae951449411cd1430c
parent34bf824bf755fdf4979a9ed26e86028a12fdedc8 (diff)
downloadProject-Tick-80e06ecf90c1f062359dd16ab0417424c705546d.tar.gz
Project-Tick-80e06ecf90c1f062359dd16ab0417424c705546d.zip
Fix merge conflict between commits d306c75 and 2c888ab
-rw-r--r--deflate.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/deflate.c b/deflate.c
index ba7235b5a4..5a44b49904 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