From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Fri, 22 May 2015 20:26:18 +0000 (+0200)
Subject: Make it clear for the compiler that fill_window_c is never
X-Git-Tag: 1.9.9-b1~813
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e1103edf9937b4939ce48e64fa8594ecbf1833f8;p=thirdparty%2Fzlib-ng.git

Make it clear for the compiler that fill_window_c is never
going to be called if sse2 is enabled and the check is disabled.
---

diff --git a/deflate.c b/deflate.c
index ef8a0c3b0..ebfcb6dff 100644
--- a/deflate.c
+++ b/deflate.c
@@ -1165,17 +1165,19 @@ local void fill_window_c(deflate_state *s);
 local void fill_window(deflate_state *s)
 {
 #ifdef X86_SSE2_FILL_WINDOW
-#ifndef X86_NOCHECK_SSE2
+# ifndef X86_NOCHECK_SSE2
     if (x86_cpu_has_sse2) {
-#endif
+# endif
         fill_window_sse(s);
-        return;
-#ifndef X86_NOCHECK_SSE2
-  }
-#endif
-#endif
-    
+# ifndef X86_NOCHECK_SSE2
+    }else{
+        fill_window_c(s);
+    }
+# endif
+
+#else
     fill_window_c(s);
+#endif
 }
 
 local void fill_window_c(deflate_state *s)