From 1e580a10fad09833552deb797128e00c50d74bce Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Fri, 6 Mar 2015 14:34:20 -0800 Subject: Fix multiply defined macro in zlib.h on linux_chromium_clobber_rel_ng builder. Speculative fix since the issue doesn't reproduce locally. TBR=brettw@chromium.org Review URL: https://codereview.chromium.org/988883002 --- core/src/fxcodec/fx_zlib/zlib_v128/zlib.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h b/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h index 9eb5e3a011..2d5812acf1 100644 --- a/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h +++ b/core/src/fxcodec/fx_zlib/zlib_v128/zlib.h @@ -1779,6 +1779,8 @@ ZEXTERN int ZEXPORT gzgetc_ OF((gzFile file)); /* backward compatibility */ # define gzseek gzseek64 # define gztell gztell64 # define gzoffset gzoffset64 +# undef adler32_combine +# undef crc32_combine # define adler32_combine adler32_combine64 # define crc32_combine crc32_combine64 # endif -- cgit v1.2.3