From: Hans Kristian Rosbach <hk-git@circlestorm.org>
Date: Sun, 26 Apr 2015 17:45:05 +0000 (+0200)
Subject: Fix previous patches mistakes
X-Git-Tag: 1.9.9-b1~877
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2fb8e04202f8d90994722bcdc6c62d3ecbe9fe09;p=thirdparty%2Fzlib-ng.git

Fix previous patches mistakes
---

diff --git a/arch/x86/fill_window_sse.c b/arch/x86/fill_window_sse.c
index a244455c5..8378d4eb2 100644
--- a/arch/x86/fill_window_sse.c
+++ b/arch/x86/fill_window_sse.c
@@ -148,7 +148,7 @@ ZLIB_INTERNAL void fill_window_sse(deflate_state *s)
             init = s->window_size - curr;
             if (init > WIN_INIT)
                 init = WIN_INIT;
-            memzero(s->window + curr, 0, (unsigned)init);
+            memset(s->window + curr, 0, (unsigned)init);
             s->high_water = curr + init;
         }
         else if (s->high_water < (ulg)curr + WIN_INIT) {
@@ -159,7 +159,7 @@ ZLIB_INTERNAL void fill_window_sse(deflate_state *s)
             init = (ulg)curr + WIN_INIT - s->high_water;
             if (init > s->window_size - s->high_water)
                 init = s->window_size - s->high_water;
-            memzero(s->window + s->high_water, 0, (unsigned)init);
+            memset(s->window + s->high_water, 0, (unsigned)init);
             s->high_water += init;
         }
     }
diff --git a/deflate.c b/deflate.c
index 855a3d063..b5af395b3 100644
--- a/deflate.c
+++ b/deflate.c
@@ -228,7 +228,7 @@ bulk_insert_str(deflate_state *s, Pos startpos, uInt count) {
  */
 #define CLEAR_HASH(s) \
     s->head[s->hash_size-1] = NIL; \
-    memzero((Byte *)s->head, 0, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+    memset((Byte *)s->head, 0, (unsigned)(s->hash_size-1)*sizeof(*s->head));
 
 /* ========================================================================= */
 int ZEXPORT deflateInit_(strm, level, version, stream_size)
@@ -1364,7 +1364,7 @@ local void fill_window_c(deflate_state *s)
             init = s->window_size - curr;
             if (init > WIN_INIT)
                 init = WIN_INIT;
-            memzero(s->window + curr, 0, (unsigned)init);
+            memset(s->window + curr, 0, (unsigned)init);
             s->high_water = curr + init;
         }
         else if (s->high_water < (ulg)curr + WIN_INIT) {
@@ -1375,7 +1375,7 @@ local void fill_window_c(deflate_state *s)
             init = (ulg)curr + WIN_INIT - s->high_water;
             if (init > s->window_size - s->high_water)
                 init = s->window_size - s->high_water;
-            memzero(s->window + s->high_water, 0, (unsigned)init);
+            memset(s->window + s->high_water, 0, (unsigned)init);
             s->high_water += init;
         }
     }
diff --git a/zutil.h b/zutil.h
index 100073f83..c0fd76225 100644
--- a/zutil.h
+++ b/zutil.h
@@ -22,9 +22,7 @@
 #include "zlib.h"
 
 #ifndef Z_SOLO
-#  if defined(_MSC_VER)
-#    include <stddef.h>
-#  endif
+#  include <stddef.h>
 #  include <string.h>
 #  include <stdlib.h>
 #endif