diff options
| author | Joel Brobecker <brobecker@adacore.com> | 2015-11-25 15:09:09 -0800 |
|---|---|---|
| committer | Joel Brobecker <brobecker@adacore.com> | 2015-11-25 15:14:47 -0800 |
| commit | da09a436519e8085d328a586c438b5b0a560924d (patch) | |
| tree | 00c45547fe27ee944ef36f7260a241e9d287a17b /zlib/trees.c | |
| parent | 74b03b91333ccbc8fa70647eca22062e902f797f (diff) | |
| download | gdb-da09a436519e8085d328a586c438b5b0a560924d.zip gdb-da09a436519e8085d328a586c438b5b0a560924d.tar.gz gdb-da09a436519e8085d328a586c438b5b0a560924d.tar.bz2 | |
Import zlib 1.2.8 with local change merged in.
ChangeLog:
* zlib: Update to zlib 1.2.8 with local changes merged in.
Diffstat (limited to 'zlib/trees.c')
| -rw-r--r-- | zlib/trees.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/zlib/trees.c b/zlib/trees.c index cd0af2d..4b5dfa1 100644 --- a/zlib/trees.c +++ b/zlib/trees.c @@ -146,8 +146,8 @@ local void send_tree OF((deflate_state *s, ct_data *tree, int max_code)); local int build_bl_tree OF((deflate_state *s)); local void send_all_trees OF((deflate_state *s, int lcodes, int dcodes, int blcodes)); -local void compress_block OF((deflate_state *s, ct_data *ltree, - ct_data *dtree)); +local void compress_block OF((deflate_state *s, const ct_data *ltree, + const ct_data *dtree)); local int detect_data_type OF((deflate_state *s)); local unsigned bi_reverse OF((unsigned value, int length)); local void bi_windup OF((deflate_state *s)); @@ -972,7 +972,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) } else if (s->strategy == Z_FIXED || static_lenb == opt_lenb) { #endif send_bits(s, (STATIC_TREES<<1)+last, 3); - compress_block(s, (ct_data *)static_ltree, (ct_data *)static_dtree); + compress_block(s, (const ct_data *)static_ltree, + (const ct_data *)static_dtree); #ifdef DEBUG s->compressed_len += 3 + s->static_len; #endif @@ -980,7 +981,8 @@ void ZLIB_INTERNAL _tr_flush_block(s, buf, stored_len, last) send_bits(s, (DYN_TREES<<1)+last, 3); send_all_trees(s, s->l_desc.max_code+1, s->d_desc.max_code+1, max_blindex+1); - compress_block(s, (ct_data *)s->dyn_ltree, (ct_data *)s->dyn_dtree); + compress_block(s, (const ct_data *)s->dyn_ltree, + (const ct_data *)s->dyn_dtree); #ifdef DEBUG s->compressed_len += 3 + s->opt_len; #endif @@ -1057,8 +1059,8 @@ int ZLIB_INTERNAL _tr_tally (s, dist, lc) */ local void compress_block(s, ltree, dtree) deflate_state *s; - ct_data *ltree; /* literal tree */ - ct_data *dtree; /* distance tree */ + const ct_data *ltree; /* literal tree */ + const ct_data *dtree; /* distance tree */ { unsigned dist; /* distance of matched string */ int lc; /* match length or unmatched char (if dist == 0) */ |