From 32efb3e42f67bc300a26c21837e4cc5813444be4 Mon Sep 17 00:00:00 2001 From: Mark Adler Date: Thu, 17 Sep 2020 11:09:46 -0700 Subject: [PATCH 1/3] [Backport] Change macro name Reference: https://github.com/madler/zlib/commit/53ce2713117ef2a8ed682d77b944df991c499252 Change macro name in inflate.c to avoid collision in VxWorks. --- inflate.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/inflate.c b/inflate.c index ac333e8..36a6120 100644 --- a/inflate.c +++ b/inflate.c @@ -447,10 +447,10 @@ unsigned copy; /* check function to use adler32() for zlib or crc32() for gzip */ #ifdef GUNZIP -# define UPDATE(check, buf, len) \ +# define UPDATE_CHECK(check, buf, len) \ (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) #else -# define UPDATE(check, buf, len) adler32(check, buf, len) +# define UPDATE_CHECK(check, buf, len) adler32(check, buf, len) #endif /* check macros for header crc */ @@ -1202,7 +1202,7 @@ int flush; state->total += out; if ((state->wrap & 4) && out) strm->adler = state->check = - UPDATE(state->check, put - out, out); + UPDATE_CHECK(state->check, put - out, out); out = left; if ((state->wrap & 4) && ( #ifdef GUNZIP @@ -1265,7 +1265,7 @@ int flush; state->total += out; if ((state->wrap & 4) && out) strm->adler = state->check = - UPDATE(state->check, strm->next_out - out, out); + UPDATE_CHECK(state->check, strm->next_out - out, out); strm->data_type = (int)state->bits + (state->last ? 64 : 0) + (state->mode == TYPE ? 128 : 0) + (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); -- 2.23.0