Commit eea7d332 authored by nbarth@chromium.org's avatar nbarth@chromium.org

Mac OS X build: turn off common word macros in AssertMacros.h

Mac OS X AssertMacros.h defining macros that collide with common names, like
'check', 'require', and 'verify'.
This CL turns this behavior off by specifying
define __ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE 0
...allowing us to use these words normally.

Refs:
http://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/AssertMacros.h

[blink-dev] Fix collision with Apple macros?
https://groups.google.com/a/chromium.org/d/topic/blink-dev/MIjO2Gwc3qc/discussion

Review URL: https://codereview.chromium.org/277273002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@270992 0039d316-1c4b-4281-b951-d872f2087c98
parent 535a985a
......@@ -4524,6 +4524,13 @@
}], # 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'.
# (Included by system header. Also exists on iOS but not included.)
# http://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/AssertMacros.h
'__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
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment