aboutsummaryrefslogtreecommitdiff
path: root/inflate.c
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 /inflate.c
parente54494e6bc6dc661269201435f6961b44354fb40 (diff)
downloadzlib-53ce2713117ef2a8ed682d77b944df991c499252.tar.gz
zlib-53ce2713117ef2a8ed682d77b944df991c499252.tar.bz2
zlib-53ce2713117ef2a8ed682d77b944df991c499252.zip
Change macro name in inflate.c to avoid collision in VxWorks.
Diffstat (limited to 'inflate.c')
-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;
448 448
449/* check function to use adler32() for zlib or crc32() for gzip */ 449/* check function to use adler32() for zlib or crc32() for gzip */
450#ifdef GUNZIP 450#ifdef GUNZIP
451# define UPDATE(check, buf, len) \ 451# define UPDATE_CHECK(check, buf, len) \
452 (state->flags ? crc32(check, buf, len) : adler32(check, buf, len)) 452 (state->flags ? crc32(check, buf, len) : adler32(check, buf, len))
453#else 453#else
454# define UPDATE(check, buf, len) adler32(check, buf, len) 454# define UPDATE_CHECK(check, buf, len) adler32(check, buf, len)
455#endif 455#endif
456 456
457/* check macros for header crc */ 457/* check macros for header crc */
@@ -1203,7 +1203,7 @@ int flush;
1203 state->total += out; 1203 state->total += out;
1204 if ((state->wrap & 4) && out) 1204 if ((state->wrap & 4) && out)
1205 strm->adler = state->check = 1205 strm->adler = state->check =
1206 UPDATE(state->check, put - out, out); 1206 UPDATE_CHECK(state->check, put - out, out);
1207 out = left; 1207 out = left;
1208 if ((state->wrap & 4) && ( 1208 if ((state->wrap & 4) && (
1209#ifdef GUNZIP 1209#ifdef GUNZIP
@@ -1266,7 +1266,7 @@ int flush;
1266 state->total += out; 1266 state->total += out;
1267 if ((state->wrap & 4) && out) 1267 if ((state->wrap & 4) && out)
1268 strm->adler = state->check = 1268 strm->adler = state->check =
1269 UPDATE(state->check, strm->next_out - out, out); 1269 UPDATE_CHECK(state->check, strm->next_out - out, out);
1270 strm->data_type = (int)state->bits + (state->last ? 64 : 0) + 1270 strm->data_type = (int)state->bits + (state->last ? 64 : 0) +
1271 (state->mode == TYPE ? 128 : 0) + 1271 (state->mode == TYPE ? 128 : 0) +
1272 (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0); 1272 (state->mode == LEN_ || state->mode == COPY_ ? 256 : 0);