From 98b56332e9b5c04cde680301a8b0685590c3b922 Mon Sep 17 00:00:00 2001 From: Andrew Weintraub Date: Wed, 29 Nov 2017 23:27:10 +0000 Subject: Allow building pdfium against the system version of libpng. Bug: Change-Id: I0c930ca30637f58af3b60ed8f1383bd9234a1723 Reviewed-on: https://pdfium-review.googlesource.com/19850 Commit-Queue: Lei Zhang Reviewed-by: Lei Zhang --- core/fxcodec/codec/ccodec_pngmodule.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'core') diff --git a/core/fxcodec/codec/ccodec_pngmodule.cpp b/core/fxcodec/codec/ccodec_pngmodule.cpp index 40bdfba7ce..37e83f7248 100644 --- a/core/fxcodec/codec/ccodec_pngmodule.cpp +++ b/core/fxcodec/codec/ccodec_pngmodule.cpp @@ -14,10 +14,11 @@ #include "core/fxge/fx_dib.h" #include "third_party/base/ptr_util.h" -extern "C" { -#undef FAR +#ifdef USE_SYSTEM_LIBPNG +#include +#else #include "third_party/libpng16/png.h" -} // extern "C" +#endif #define PNG_ERROR_SIZE 256 -- cgit v1.2.3