Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(57)

Unified Diff: third_party/BUILD.gn

Issue 1954773002: Resolve macro redefinition warnings when built in Chromium (Closed) Base URL: https://pdfium.googlesource.com/pdfium.git@master
Patch Set: fix GN build as well Created 4 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | third_party/third_party.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/BUILD.gn
diff --git a/third_party/BUILD.gn b/third_party/BUILD.gn
index e0c9bf116e7b65b79c11659f39c66e0c861b9488..1176e9287534b525ab73b0a7995f08ee5c1a7b96 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",
« no previous file with comments | « no previous file | third_party/third_party.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698