diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 08:48:38 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-12 08:48:38 +0000 |
| commit | f159d38cb10c746d54e1f380c94878dbeb935b01 (patch) | |
| tree | a71e2dadea23a0da5d25c867c0b6ecf2d420a10f /third_party/zlib/trees.h | |
| parent | 8a9378308da3edfed5b1d53d0c82345f1f11a420 (diff) | |
| download | chromium_src-f159d38cb10c746d54e1f380c94878dbeb935b01.zip chromium_src-f159d38cb10c746d54e1f380c94878dbeb935b01.tar.gz chromium_src-f159d38cb10c746d54e1f380c94878dbeb935b01.tar.bz2 | |
Update zlib to 1.2.5.
This change applies upstream patches from 1.2.3 to 1.2.5.
BUG=30704,39219
TEST=build and run Chrome without any valgrind errors.
Review URL: http://codereview.chromium.org/8806004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/zlib/trees.h')
| -rw-r--r-- | third_party/zlib/trees.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/zlib/trees.h b/third_party/zlib/trees.h index 72facf9..d35639d 100644 --- a/third_party/zlib/trees.h +++ b/third_party/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, |