From a2af7de2e32e6938dd825acb8df775b11ec95510 Mon Sep 17 00:00:00 2001 From: Lei Zhang Date: Fri, 31 Mar 2017 13:33:12 -0700 Subject: Move zlib to a DEPS-based checkout. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit BUG=chromium:541704 Change-Id: I313d8853450ff5940b3baa4054ff441b342c46b7 Reviewed-on: https://pdfium-review.googlesource.com/3350 Commit-Queue: Lei Zhang Reviewed-by: dsinclair Reviewed-by: Nicolás Peña --- third_party/libpng16/0000-build-config.patch | 12 ------------ third_party/libpng16/pngstruct.h | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) (limited to 'third_party/libpng16') diff --git a/third_party/libpng16/0000-build-config.patch b/third_party/libpng16/0000-build-config.patch index d997cbd18b..5c30866405 100644 --- a/third_party/libpng16/0000-build-config.patch +++ b/third_party/libpng16/0000-build-config.patch @@ -29,15 +29,3 @@ diff a/third_party/libpng16/pngmem.c b/third_party/libpng16/pngmem.c } #ifdef PNG_USER_MEM_SUPPORTED -diff a/third_party/libpng16/pngstruct.h b/third_party/libpng16/pngstruct.h ---- a/third_party/libpng16/pngstruct.h -+++ b/third_party/libpng16/pngstruct.h -@@ -27,7 +27,7 @@ - /* We must ensure that zlib uses 'const' in declarations. */ - # define ZLIB_CONST - #endif --#include "zlib.h" -+#include "third_party/zlib_v1211/zlib.h" - #ifdef const - /* zlib.h sometimes #defines const to nothing, undo this. */ - # undef const diff --git a/third_party/libpng16/pngstruct.h b/third_party/libpng16/pngstruct.h index bbd73211ab..c1f35edef5 100644 --- a/third_party/libpng16/pngstruct.h +++ b/third_party/libpng16/pngstruct.h @@ -27,7 +27,7 @@ /* We must ensure that zlib uses 'const' in declarations. */ # define ZLIB_CONST #endif -#include "third_party/zlib_v1211/zlib.h" +#include "zlib.h" #ifdef const /* zlib.h sometimes #defines const to nothing, undo this. */ # undef const -- cgit v1.2.3