From 25d5be60c504f3df0722caea6e7a846b8e8d9537 Mon Sep 17 00:00:00 2001 From: Tom Sepez Date: Thu, 18 Jun 2015 17:44:29 -0700 Subject: Fix XFA builds under chromium checkouts This pulls in from origin/master: 94dd28e Update GN build files w/ cpu_arch -> current_cpu changes. 1e580a1 Fix multiply defined macro in zlib.h Add a missing file to BUILD.gn dropped at 1ed8a21. TBR=thestig@chromium.org Review URL: https://codereview.chromium.org/1189133006. --- core/src/fxcodec/fx_zlib/zlib_v128/zlib.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'core') 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