[ros-diffs] [reactos] 01/01: [ZLIB] Import upstream commit 38e8ce32afbaa82f67d992b9f3056f281fe69259:

[Hervé Poussineau]

https://git.reactos.org/?p=reactos.git;a=commitdiff;h=a1790125631855c24fbf8…

commit a1790125631855c24fbf8a4b7dade4f17945006f
Author:     Hervé Poussineau <hpoussin(a)reactos.org>
AuthorDate: Mon Dec 31 14:23:14 2018 +0100
Commit:     Pierre Schweitzer <pierre(a)reactos.org>
CommitDate: Mon Dec 31 14:23:59 2018 +0100

    [ZLIB] Import upstream commit 38e8ce32afbaa82f67d992b9f3056f281fe69259:
    
    Fix CLEAR_HASH macro to be usable as a single statement.
    As it is used in deflateParams().
---
 sdk/lib/3rdparty/zlib/deflate.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/sdk/lib/3rdparty/zlib/deflate.c b/sdk/lib/3rdparty/zlib/deflate.c
index 1ec761448d..d32007fa41 100644
--- a/sdk/lib/3rdparty/zlib/deflate.c
+++ b/sdk/lib/3rdparty/zlib/deflate.c
@@ -190,8 +190,11 @@ local const config configuration_table[10] = {
  * prev[] will be initialized on the fly.
  */
 #define CLEAR_HASH(s) \
-    s->head[s->hash_size-1] = NIL; \
-    zmemzero((Bytef *)s->head, (unsigned)(s->hash_size-1)*sizeof(*s->head));
+    do { \
+        s->head[s->hash_size-1] = NIL; \
+        zmemzero((Bytef *)s->head, \
+                 (unsigned)(s->hash_size-1)*sizeof(*s->head)); \
+} while (0)
 
 /* ===========================================================================
  * Slide the hash table when sliding the window down (could be avoided with 32