diff options
| author | unknown <serg@serg.mylan> | 2005-03-23 21:08:13 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-23 21:08:13 +0100 |
| commit | d4285cae162fed7e170507f10eff9cec3b240a6d (patch) | |
| tree | 9defb6fc4bb5a6c4a12f100e1c2644a098e81253 /zlib/trees.c | |
| parent | 58aeecb078023ea64c40d8fe2af74a756b759ea2 (diff) | |
| download | mariadb-git-d4285cae162fed7e170507f10eff9cec3b240a6d.tar.gz | |
upgrade zlib to 1.2.2
acinclude.m4:
clarify help text
Diffstat (limited to 'zlib/trees.c')
| -rw-r--r-- | zlib/trees.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/zlib/trees.c b/zlib/trees.c index bb09554938b..52c820fa2e9 100644 --- a/zlib/trees.c +++ b/zlib/trees.c @@ -931,7 +931,7 @@ void _tr_flush_block(s, buf, stored_len, eof) if (s->level > 0) { /* Check if the file is ascii or binary */ - if (s->data_type == Z_UNKNOWN) set_data_type(s); + if (s->strm->data_type == Z_UNKNOWN) set_data_type(s); /* Construct the literal and distance trees */ build_tree(s, (tree_desc *)(&(s->l_desc))); @@ -1131,7 +1131,7 @@ local void set_data_type(s) while (n < 7) bin_freq += s->dyn_ltree[n++].Freq; while (n < 128) ascii_freq += s->dyn_ltree[n++].Freq; while (n < LITERALS) bin_freq += s->dyn_ltree[n++].Freq; - s->data_type = (Byte)(bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII); + s->strm->data_type = bin_freq > (ascii_freq >> 2) ? Z_BINARY : Z_ASCII; } /* =========================================================================== |