diff options
| -rw-r--r-- | third_party/BUILD.gn | 10 | ||||
| -rw-r--r-- | third_party/third_party.gyp | 12 |
2 files changed, 20 insertions, 2 deletions
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn index e0c9bf116e..1176e92875 100644 --- a/third_party/BUILD.gn +++ b/third_party/BUILD.gn @@ -328,11 +328,21 @@ source_set("fx_lpng") { } if (pdf_enable_xfa) { + config("fx_tiff_warnings") { + visibility = [ ":*" ] + if (is_win) { + cflags = [ + "/wd4005", # Macro redefinition for 'WIN32_LEAN_AND_MEAN'. + ] + } + } source_set("fx_tiff") { configs -= [ "//build/config/compiler:chromium_code" ] configs += [ "//build/config/compiler:no_chromium_code", "../:pdfium_config", + + ":fx_tiff_warnings", ] deps = [ "//third_party:jpeg", diff --git a/third_party/third_party.gyp b/third_party/third_party.gyp index 7fd1082454..840c16635d 100644 --- a/third_party/third_party.gyp +++ b/third_party/third_party.gyp @@ -12,7 +12,6 @@ 'OPJ_STATIC', 'PNG_PREFIX', 'PNG_USE_READ_MACROS', - '_CRT_SECURE_NO_WARNINGS', ], 'include_dirs': [ # This is implicit in GN. @@ -20,7 +19,7 @@ '..', ], 'msvs_disabled_warnings': [ - 4005, 4018, 4146, 4333, 4345, 4267 + 4018, 4146, 4333, 4345, 4267 ], }, 'targets': [ @@ -411,6 +410,15 @@ 'libtiff/tif_write.c', 'libtiff/tif_zip.c', ], + 'conditions': [ + ['OS=="win"', { + 'defines!': [ + # Need to undefine the macro since it is redefined in + # tif_ojpeg.c and tif_jpeg.c. + 'WIN32_LEAN_AND_MEAN', + ], + }], + ], }, ], }], |