summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Adler <madler@alumni.caltech.edu>2020-09-17 11:09:46 -0700
committerMark Adler <madler@alumni.caltech.edu>2020-09-17 11:09:46 -0700
commit53ce2713117ef2a8ed682d77b944df991c499252 (patch)
tree6e47a62e638d94d192ce1e87d9623830fa740459
parente54494e6bc6dc661269201435f6961b44354fb40 (diff)
downloadzlib-53ce2713117ef2a8ed682d77b944df991c499252.tar.gz
Change macro name in inflate.c to avoid collision in VxWorks.
-rw-r--r--inflate.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/inflate.c b/inflate.c
index 2c1b17f..dac2c74 100644
--- a/inflate.c
+++ b/inflate.c
@@ -448,10 +448,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 */
@@ -1203,7 +1203,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
@@ -1266,7 +1266,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);