diff options
| author | Björn Gustavsson <[email protected]> | 2014-01-22 16:19:32 +0100 |
|---|---|---|
| committer | Björn Gustavsson <[email protected]> | 2014-01-22 16:19:32 +0100 |
| commit | e99633a51cbd22b16606c2669c575c22cf1c511f (patch) | |
| tree | 784ef6b3eec7461e7b8962fee2d1ba6858b516b6 /erts/emulator/zlib/trees.h | |
| parent | 990b655c92f889d2c45e6f43ee6fdae29ffc8464 (diff) | |
| parent | 9f57d8c4f86323cf7481c9a7e512486087bb5542 (diff) | |
| download | otp-e99633a51cbd22b16606c2669c575c22cf1c511f.tar.gz otp-e99633a51cbd22b16606c2669c575c22cf1c511f.tar.bz2 otp-e99633a51cbd22b16606c2669c575c22cf1c511f.zip | |
Merge branch 'bjorn/erts/zlib-1.2.8'
* bjorn/erts/zlib-1.2.8:
configure: Prefer the system's zlib over own our zlib source
Update preloaded modules
Add the 'rle' zstrategy
Don't make gzio.c dependent on the zutil.h header file
Update zlib to 1.2.8
erts/zlib: Remove unused file example.c
Diffstat (limited to 'erts/emulator/zlib/trees.h')
| -rw-r--r-- | erts/emulator/zlib/trees.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/emulator/zlib/trees.h b/erts/emulator/zlib/trees.h index 72facf900f..d35639d82a 100644 --- a/erts/emulator/zlib/trees.h +++ b/erts/emulator/zlib/trees.h @@ -70,7 +70,7 @@ local const ct_data static_dtree[D_CODES] = { {{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} }; -const uch _dist_code[DIST_CODE_LEN] = { +const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = { 0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, 8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, @@ -99,7 +99,7 @@ const uch _dist_code[DIST_CODE_LEN] = { 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 }; -const uch _length_code[MAX_MATCH-MIN_MATCH+1]= { +const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= { 0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, 13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, |