1081258 - Non-unified bustage in DOMCameraControlListener.cpp when building with MSVC2013

Status: RESOLVED FIXED

(Core :: DOM: Core & HTML, defect)

Description

[Ryan VanderMeulen [:RyanVM]]

https://tbpl.mozilla.org/php/getParsedLog.php?id=49977688&tree=Try

DOMCameraControlListener.cpp

c:\tools\vs2013\vc\include\math.h(106) : error C2220: warning treated as error - no 'object' file generated

c:\tools\vs2013\vc\include\math.h(106) : warning C4005: 'NAN' : macro redefinition

        c:\builds\moz2_slave\try-w32-0000000000000000000000\build\dom\camera\CameraCommon.h(19) : see previous definition of 'NAN'

c:/builds/moz2_slave/try-w32-0000000000000000000000/build/config/rules.mk:948: recipe for target 'DOMCameraControlListener.obj' failed
mozmake.exe[5]: *** [DOMCameraControlListener.obj] Error 2

Comment 1

[Benjamin Smedberg]

Attachment: 1081258-NAN

Untested, but this ought to work.

Comment 2

[(Away)]

Comment on attachment 8503348 [details] [diff] [review]
1081258-NAN

Review of attachment 8503348 [details] [diff] [review]:
-----------------------------------------------------------------

Can we just get rid of it? I can't find any uses of NAN remaining after these refactorings:

http://dxr.mozilla.org/mozilla-central/search?q=regexp%3A\WNAN\W&case=true&redirect=true
http://hg.mozilla.org/mozilla-central/rev/e93e96ed8a5a
http://hg.mozilla.org/mozilla-central/rev/6ae8548ce144
http://hg.mozilla.org/mozilla-central/rev/c9f413c5774e

Comment 3

[(Away)]

(And good catch, Ryan. This must have been a recent regression since I had a green 2013 Bn on Wednesday: https://tbpl.mozilla.org/?tree=Try&rev=c8a14d829945)

Comment 4

[Benjamin Smedberg]

Attachment: 1081258-NAN

Yes, that works too.

Comment 5

[Mike Habicher [:mikeh] (high bugzilla latency)]

Comment on attachment 8503367 [details] [diff] [review]
1081258-NAN

Review of attachment 8503367 [details] [diff] [review]:
-----------------------------------------------------------------

LGTM.

Comment 6

[(Away)]

I verified that the patch builds and pushed it:
https://hg.mozilla.org/integration/mozilla-inbound/rev/43bd6e46c62c

Comment 7

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/43bd6e46c62c