Fix multiply defined macro in zlib.h on linux_chromium_clobber_rel_ng builder.
authorTom Sepez <tsepez@chromium.org>
Fri, 6 Mar 2015 22:34:20 +0000 (14:34 -0800)
committerTom Sepez <tsepez@chromium.org>
Fri, 6 Mar 2015 22:34:20 +0000 (14:34 -0800)
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

index 9eb5e3a..2d5812a 100644 (file)
@@ -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