summaryrefslogtreecommitdiff
path: root/core/src
diff options
context:
space:
mode:
authorTom Sepez <tsepez@chromium.org>2015-06-18 17:44:29 -0700
committerTom Sepez <tsepez@chromium.org>2015-06-18 17:44:29 -0700
commit25d5be60c504f3df0722caea6e7a846b8e8d9537 (patch)
treed468209ec776de247386a267c68f5da0e966ba1b /core/src
parent25f0ce3cc763f721377eeec8866853894c1f1b41 (diff)
downloadpdfium-25d5be60c504f3df0722caea6e7a846b8e8d9537.tar.xz
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.
Diffstat (limited to 'core/src')
-rw-r--r--core/src/fxcodec/fx_zlib/zlib_v128/zlib.h2
1 files changed, 2 insertions, 0 deletions
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