summaryrefslogtreecommitdiff
path: root/third_party/libpng16
diff options
context:
space:
mode:
authorAdenilson Cavalcanti <adenilson.cavalcanti@arm.com>2017-03-23 11:04:40 -0700
committerChromium commit bot <commit-bot@chromium.org>2017-03-27 14:27:21 +0000
commit8e3f692b03e97659e855be4ea7c7b45d1c0f20c5 (patch)
treec579d1744c9d1f56162a874dff687b55fb1b456a /third_party/libpng16
parentf4a9f83b38a0a45cda3205ad50747e6a7719f8ab (diff)
downloadpdfium-8e3f692b03e97659e855be4ea7c7b45d1c0f20c5.tar.xz
Update to zlib 1.2.11
This is the same version used by Chromium (as also the latest release of zlib). BUG=687631 Change-Id: Ia4bcdee3c36443ba01914d157ea795d7fb881a45 Reviewed-on: https://pdfium-review.googlesource.com/3096 Commit-Queue: dsinclair <dsinclair@chromium.org> Reviewed-by: dsinclair <dsinclair@chromium.org>
Diffstat (limited to 'third_party/libpng16')
-rw-r--r--third_party/libpng16/0000-build-config.patch2
-rw-r--r--third_party/libpng16/pngstruct.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/third_party/libpng16/0000-build-config.patch b/third_party/libpng16/0000-build-config.patch
index 7b7b158f32..d997cbd18b 100644
--- a/third_party/libpng16/0000-build-config.patch
+++ b/third_party/libpng16/0000-build-config.patch
@@ -37,7 +37,7 @@ diff a/third_party/libpng16/pngstruct.h b/third_party/libpng16/pngstruct.h
# define ZLIB_CONST
#endif
-#include "zlib.h"
-+#include "third_party/zlib_v128/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 0b372de4c6..bbd73211ab 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_v128/zlib.h"
+#include "third_party/zlib_v1211/zlib.h"
#ifdef const
/* zlib.h sometimes #defines const to nothing, undo this. */
# undef const