1321777 - timezone definition conflict since bug 1303091

Status: RESOLVED FIXED

(Core :: JavaScript: Internationalization API, defect)

Description

[Landry Breuil (:gaston)]

Build failure on OpenBSD, which has struct timezone in sys/time.h


35:58.02 In file included from /home/obj/m-c/js/src/Unified_cpp_js_src0.cpp:20:                                                            
35:58.04 /home/othersrc/mozilla-central/js/src/builtin/Intl.cpp:2171:39: error: reference to 'timezone' is ambiguous                       
35:58.06     for (const auto& legacyTimeZone : timezone::legacyICUTimeZones) {                                                             
35:58.08                                       ^                                                                                           
35:58.09 /usr/include/sys/time.h:72:8: note: candidate found by name lookup is 'timezone'                                                  
35:58.09 struct timezone {
35:58.09        ^
35:58.12 /home/othersrc/mozilla-central/js/src/builtin/IntlTimeZoneData.h:8:11: note: candidate found by name lookup is 'js::timezone'
35:58.12 namespace timezone {

prepending js:: namespace fixes the issue.

Comment 1

[Landry Breuil (:gaston)]

Attachment: bug-1321777

Comment 2

[André Bargull [:anba]]

Comment on attachment 8816420 [details] [diff] [review]
bug-1321777

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

Thanks for fixing!

Comment 3

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/mozilla-inbound/rev/c699b4675d34
Prepend js namespace to timezone to fix a build failure on OpenBSD. r=andrebargull

Comment 4

[Phil Ringnalda (:philor)]

https://hg.mozilla.org/mozilla-central/rev/c699b4675d34

Comment 5

[Landry Breuil (:gaston)]

Comment on attachment 8816420 [details] [diff] [review]
bug-1321777

Approval Request Comment
[Feature/Bug causing the regression]: 1303091
[User impact if declined]: FTBFS on OpenBSD, see http://buildbot.rhaalovely.net/builders/mozilla-aurora-amd64/builds/1880
[Is this code covered by automated tests?]: ?
[Has the fix been verified in Nightly?]: Landed in https://hg.mozilla.org/mozilla-central/rev/c699b4675d34
[Needs manual test from QE? If yes, steps to reproduce]: no
[List of other uplifts needed for the feature/fix]: none
[Is the change risky?]: no
[Why is the change risky/not risky?]: uses explicit namespace
[String changes made/needed]: none

Comment 6

[Julien Cristau [:jcristau]]

Comment on attachment 8816420 [details] [diff] [review]
bug-1321777

openbsd build fix, take in aurora52

Comment 7

[Carsten Book [:Tomcat]]

https://hg.mozilla.org/releases/mozilla-aurora/rev/48a4769a75a5