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 185682daeaf921c35f9b485c33191618f067c437..73f8f83a6f9f4139a2f397d3a83f1cbd5f192514 100644 (file)
--- 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;