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

Fix merge conflict between commits 5640481 and 5545321
(and clean out some code that is not strictly needed)
---

diff --git a/deflate.c b/deflate.c
index 185682dae..73f8f83a6 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1330,6 +1330,7 @@ local void fill_window_c(s)
              */
             {
                 int i; 
+                unsigned m;
                 typeof(p) q = p - n;
                 for (i = 0; i < n; i++) {
                     Pos m = *q;
@@ -1338,14 +1339,6 @@ local void fill_window_c(s)
                 }
             }
             
-            /* The following three assignments are unnecessary as the variable
-             * p, n and m are dead at this point. The rationale for these
-             * statements is to ease the reader to verify the two loops are
-             * equivalent.
-             */
-            p = p - n;
-            n = 0;
-            m = *p;
 #endif /* NOT_TWEAK_COMPILER */
             n = wsize;
 #ifndef FASTEST
@@ -1362,6 +1355,7 @@ local void fill_window_c(s)
 #else
             {
                 int i; 
+                unsigned m;
                 typeof(p) q = p - n;
                 for (i = 0; i < n; i++) {
                     Pos m = *q;