diff options
| author | Tom Sepez <tsepez@chromium.org> | 2015-03-06 14:34:20 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2015-03-06 14:34:20 -0800 |
| commit | 1e580a10fad09833552deb797128e00c50d74bce (patch) | |
| tree | 7d2c2df77b34bbab54d7db7fb23a2cee2a00f94b /core | |
| parent | 0700106e13b84781c86398bb5e2b5dd3ed894007 (diff) | |
| download | pdfium-1e580a10fad09833552deb797128e00c50d74bce.tar.xz | |
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
Diffstat (limited to 'core')
| -rw-r--r-- | core/src/fxcodec/fx_zlib/zlib_v128/zlib.h | 2 |
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 |