Chromium Code Reviews| 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 |