DescriptionFix conflicts in our function mangling.
This change changes zlib.h to prevent it from mangling some functions twice on x64. It also adds a 'google.patch' file, a diff file from the original zlib.
BUG=30703
TEST=build Chromium on the "Chromium Linux Builder (valgrind)" bot.
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=117019
Patch Set 1 : '' #Patch Set 2 : '' #Patch Set 3 : '' #Patch Set 4 : '' #
Messages
Total messages: 6 (0 generated)
|