From befc3e504defb55fa81ac99bed8098e8a9f5259b Mon Sep 17 00:00:00 2001 From: Xin LI Date: Sun, 25 Aug 2019 23:51:44 +0000 Subject: [PATCH] Import vendor commit 38e8ce32afbaa82f67d992b9f3056f281fe69259: Author: Mark Adler Date: Sun Jan 22 23:38:52 2017 -0800 Fix CLEAR_HASH macro to be usable as a single statement. As it is used in deflateParams(). --- deflate.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/deflate.c b/deflate.c index 7f2c8a2a2a64..00c6e05c7769 100644 --- a/deflate.c +++ b/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