diff options
| author | Lei Zhang <thestig@chromium.org> | 2015-11-06 14:38:48 -0800 |
|---|---|---|
| committer | Lei Zhang <thestig@chromium.org> | 2015-11-06 14:38:48 -0800 |
| commit | 8241df7edc53b8777e7f71ff379fa53f368c3a28 (patch) | |
| tree | 418c3950809d05c00fad9a39a30e1d324e68cb8b /third_party/lpng_v163 | |
| parent | de383c5d8c0b418a5d5b55d5a4ead715e69255c5 (diff) | |
| download | pdfium-8241df7edc53b8777e7f71ff379fa53f368c3a28.tar.xz | |
Merge to XFA: Fix all relative includes to third_party.
- In non-standalone builds, use the provided jpeg library.
- Run gn format over all the GN files.
- Also roll DEPS for buildtools to c2f2598.
- And fix XFA's lack of #includes.
BUG=541704
R=tsepez@chromium.org
Review URL: https://codereview.chromium.org/1425153006 .
(cherry picked from commit 34bb6c58fe60206a08dc0a1f37b7cfe83e8c762c)
Review URL: https://codereview.chromium.org/1434543003 .
Diffstat (limited to 'third_party/lpng_v163')
| -rw-r--r-- | third_party/lpng_v163/pngstruct.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/lpng_v163/pngstruct.h b/third_party/lpng_v163/pngstruct.h index 9fe77fdd34..87adaa1a6b 100644 --- a/third_party/lpng_v163/pngstruct.h +++ b/third_party/lpng_v163/pngstruct.h @@ -28,7 +28,7 @@ /* We must ensure that zlib uses 'const' in declarations. */
# define ZLIB_CONST
#endif
-#include "../zlib_v128/zlib.h"
+#include "third_party/zlib_v128/zlib.h"
#ifdef const
/* zlib.h sometimes #defines const to nothing, undo this. */
# undef const
|