summaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2017-04-13 10:09:06 +0200
committerChromium commit bot <commit-bot@chromium.org>2017-04-13 09:13:44 +0000
commit36c5b170e722362d4b5f7cb6e4e0099ed227a307 (patch)
tree18a2a9ecec3ce38bf50d84397e5c48877cea90f5 /core
parente0b592236db902e3e8cbca7ec64f8e2b192e1935 (diff)
downloadpdfium-36c5b170e722362d4b5f7cb6e4e0099ed227a307.tar.xz
core: allow building against system zlib
In a way similar to the existing USE_SYSTEM_LIBJPEG. The default is of course still the DEPS-based zlib checkout. Change-Id: I649e75beb1a19c4cf7abda42fa10ebe5babfe946 Reviewed-on: https://pdfium-review.googlesource.com/4070 Reviewed-by: Lei Zhang <thestig@chromium.org> Commit-Queue: Lei Zhang <thestig@chromium.org>
Diffstat (limited to 'core')
-rw-r--r--core/fxcodec/codec/fx_codec_flate.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/core/fxcodec/codec/fx_codec_flate.cpp b/core/fxcodec/codec/fx_codec_flate.cpp
index ef78248217..3747b20cc3 100644
--- a/core/fxcodec/codec/fx_codec_flate.cpp
+++ b/core/fxcodec/codec/fx_codec_flate.cpp
@@ -15,7 +15,12 @@
#include "core/fxcrt/fx_ext.h"
#include "third_party/base/numerics/safe_conversions.h"
#include "third_party/base/ptr_util.h"
+
+#if defined(USE_SYSTEM_ZLIB)
+#include <zlib.h>
+#else
#include "third_party/zlib/zlib.h"
+#endif
extern "C" {