diff options
| author | Tom Sepez <tsepez@chromium.org> | 2016-03-02 16:55:26 -0800 |
|---|---|---|
| committer | Tom Sepez <tsepez@chromium.org> | 2016-03-02 16:55:26 -0800 |
| commit | d87b20e1ae765cb65281c5bd7c12fc41e8a86780 (patch) | |
| tree | b2f5e373b980d9ed8c39533827c892ce2a312faf /samples | |
| parent | 91f7f3fa6a6d62ed0ce819c3286b0ffe6eddedbc (diff) | |
| download | pdfium-d87b20e1ae765cb65281c5bd7c12fc41e8a86780.tar.xz | |
Rename png_ functions conflicting with chrome.
Part of the work required to ship XFA with chrome.
BUG=pdfium:396
R=dsinclair@chromium.org
Review URL: https://codereview.chromium.org/1763493002 .
Diffstat (limited to 'samples')
| -rw-r--r-- | samples/BUILD.gn | 7 | ||||
| -rw-r--r-- | samples/samples.gyp | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/samples/BUILD.gn b/samples/BUILD.gn index e3652086e4..9ff1bea4c1 100644 --- a/samples/BUILD.gn +++ b/samples/BUILD.gn @@ -17,24 +17,23 @@ group("samples") { config("pdfium_samples_config") { defines = [ "PNG_PREFIX", - "PNGPREFIX_H", "PNG_USE_READ_MACROS", ] include_dirs = [ ".." ] if (pdf_enable_v8) { - defines += [ "PDF_ENABLE_V8", ] + defines += [ "PDF_ENABLE_V8" ] } if (pdf_enable_xfa) { - defines += [ "PDF_ENABLE_XFA", ] + defines += [ "PDF_ENABLE_XFA" ] } } executable("pdfium_test") { testonly = true sources = [ - "pdfium_test.cc", "image_diff_png.cc", "image_diff_png.h", + "pdfium_test.cc", ] deps = [ "//build/config/sanitizers:deps", diff --git a/samples/samples.gyp b/samples/samples.gyp index da9ce74b0a..6f262d5a04 100644 --- a/samples/samples.gyp +++ b/samples/samples.gyp @@ -10,7 +10,6 @@ 'target_defaults': { 'defines' : [ 'PNG_PREFIX', - 'PNGPREFIX_H', 'PNG_USE_READ_MACROS', ], 'include_dirs': [ |