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

Unified Diff: build/common.gypi

Issue 277273002: Mac OS X build: turn off common word macros in AssertMacros.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: common.gypi instead Created 6 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 6d076bb8b86f9b8c6608af84416c7056de663c21..9a48e76e32587400c62de36d14428b9d701f3b8a 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -4521,6 +4521,12 @@
}], # OS=="mac" or OS=="ios"
['OS=="mac"', {
'target_defaults': {
+ 'defines': [
+ # Prevent Mac OS X AssertMacros.h from defining macros that collide
+ # with common names, like 'check', 'require', and 'verify'.
+ # http://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/AssertMac
Mark Mentovai 2014/05/13 14:29:17 Bad link. Missing “ros.h”.
Nils Barth (inactive) 2014/05/14 00:46:28 (>.<) Thanks, good catch!
+ '__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0',
+ ],
'variables': {
# These should end with %, but there seems to be a bug with % in
# variables that are intended to be set to different values in
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698