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

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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=270992

[Nils Barth (inactive), 2014-05-12 02:19:17]

Hi Mark,
Is this the right place for the define?
Thanks!

[Mark Mentovai, 2014-05-12 15:38:27]

There’s no guarantee that anyone will #include this file before any system
header. You should define this macro in common.gypi in a 'defines' section to
get it to be delivered to the compiler driver as a -D argument on the command
line.

[Nils Barth (inactive), 2014-05-13 06:00:38]

On 2014/05/12 15:38:27, Mark Mentovai wrote:
> There’s no guarantee that anyone will #include this file before any system
> header. You should define this macro in common.gypi in a 'defines' section to
> get it to be delivered to the compiler driver as a -D argument on the command
> line.

Thanks, got it!
Put in the OS=="mac" section of common.gypi; how does it look?

[Mark Mentovai, 2014-05-13 14:29:16]

LGTM.

iOS has the same <AssertMacros.h> header too, but it’s never #included by
anything else, so it shouldn’t be a factor.

https://codereview.chromium.org/277273002/diff/20001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/277273002/diff/20001/build/common.gypi#newcod...
build/common.gypi:4527: #
http://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/AssertMac
Bad link. Missing “ros.h”.

[Nils Barth (inactive), 2014-05-14 00:46:22]

On 2014/05/13 14:29:16, Mark Mentovai wrote:
> LGTM.
> 
> iOS has the same <AssertMacros.h> header too, but it’s never #included by
> anything else, so it shouldn’t be a factor.

I was wondering about that; thanks for clarifying!
(Added comment to that effect.)

[Nils Barth (inactive), 2014-05-14 00:46:28]

https://codereview.chromium.org/277273002/diff/20001/build/common.gypi
File build/common.gypi (right):

https://codereview.chromium.org/277273002/diff/20001/build/common.gypi#newcod...
build/common.gypi:4527: #
http://opensource.apple.com/source/CarbonHeaders/CarbonHeaders-18.1/AssertMac
On 2014/05/13 14:29:17, Mark Mentovai wrote:
> Bad link. Missing “ros.h”.

(>.<)
Thanks, good catch!

[Nils Barth (inactive), 2014-05-14 00:46:33]

The CQ bit was checked by nbarth@chromium.org

[commit-bot: I haz the power, 2014-05-14 00:47:52]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/nbarth@chromium.org/277273002/60001

[commit-bot: I haz the power, 2014-05-14 04:19:57]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_aosp on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/7...)
  ios_rel_device on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/ios_rel_device/builds...)

[commit-bot: I haz the power, 2014-05-14 04:23:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-14 04:23:23]

Try jobs failed on following builders:
  android_aosp on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/7...)

[Nils Barth (inactive), 2014-05-14 04:30:41]

The CQ bit was checked by nbarth@chromium.org

[commit-bot: I haz the power, 2014-05-14 04:31:36]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/nbarth@chromium.org/277273002/60001

[commit-bot: I haz the power, 2014-05-14 04:36:03]

FYI, CQ is re-trying this CL (attempt #1).
Please consider checking whether the failures are real,
and report flakes to chrome-troopers@google.com.
The failing builders are:
  android_aosp on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/7...)

[commit-bot: I haz the power, 2014-05-14 04:39:40]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-05-14 04:39:41]

Try jobs failed on following builders:
  android_aosp on tryserver.chromium
(http://build.chromium.org/p/tryserver.chromium/builders/android_aosp/builds/7...)

[Nils Barth (inactive), 2014-05-16 10:47:29]

The CQ bit was checked by nbarth@chromium.org

[commit-bot: I haz the power, 2014-05-16 10:48:02]

CQ is trying da patch. Follow status at
 https://chromium-status.appspot.com/cq/nbarth@chromium.org/277273002/60001

[commit-bot: I haz the power, 2014-05-16 11:43:13]

Change committed as 270992

[Nils Barth (inactive), 2014-05-26 03:02:34]

On 2014/05/16 11:43:13, I haz the power (commit-bot) wrote:
> Change committed as 270992

Oops, typo (singular/plural).

Fixed in:
Fix define typo in Mac OS X build
https://codereview.chromium.org/298093002/

Sorry for noise.