diff options
| author | Lei Zhang <thestig@chromium.org> | 2017-03-31 13:33:12 -0700 |
|---|---|---|
| committer | Chromium commit bot <commit-bot@chromium.org> | 2017-03-31 20:51:48 +0000 |
| commit | a2af7de2e32e6938dd825acb8df775b11ec95510 (patch) | |
| tree | 883664ee920a8fd64dbc96bec8cb59fe1c7ce760 /third_party/libpng16 | |
| parent | bdbb0bd92bfca52e574106c4ce5f93d9d34d3373 (diff) | |
| download | pdfium-a2af7de2e32e6938dd825acb8df775b11ec95510.tar.xz | |
Move zlib to a DEPS-based checkout.
BUG=chromium:541704
Change-Id: I313d8853450ff5940b3baa4054ff441b342c46b7
Reviewed-on: https://pdfium-review.googlesource.com/3350
Commit-Queue: Lei Zhang <thestig@chromium.org>
Reviewed-by: dsinclair <dsinclair@chromium.org>
Reviewed-by: Nicolás Peña <npm@chromium.org>
Diffstat (limited to 'third_party/libpng16')
| -rw-r--r-- | third_party/libpng16/0000-build-config.patch | 12 | ||||
| -rw-r--r-- | third_party/libpng16/pngstruct.h | 2 |
2 files changed, 1 insertions, 13 deletions
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 |