Skip to content

Commit

Permalink
Change macro name in inflate.c to avoid collision in VxWorks.
Browse files Browse the repository at this point in the history
  • Loading branch information
madler committed Sep 17, 2020
1 parent e54494e commit 53ce271
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions inflate.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 53ce271

Please sign in to comment.