1812276 - Undefine windows macro GetAcceptLanguages in unified build

Status: RESOLVED FIXED

(Core :: General, defect)

Description

[Jan Jaeschke [:jjaschke]]

As seen in Bug 1803355, adding new files to the unified build introduced Bug 1812021. This was due to file contents being moved from one unified source to another, which happened to have different sets of includes. On Windows, one include had the side effect of defining

#define GetAcceptLanguages GetAcceptLanguagesW

which changed mozilla::dom::Navigator::GetAcceptLanguages. Adding new files and thus moving content from one unified build to another leads to one unified source defining the macro and another one not defining it.

Comment 1

[Jan Jaeschke [:jjaschke]]

Attachment: Bug 1812276: Undefined `GetAcceptLanguages` macro. r=glandium

Moving source code from one unified source file to another may lead to inconsistencies where one file defines GetAcceptLanguages whereas the other one doesn't.
This can cause Undefined Symbol link errors on certain windows build configurations.

Comment 2

[Jan Jaeschke [:jjaschke]]

Here's a try run with the patch on m-c.
Here's a try run with the patch on top of Bug 1803355.

This should fix the immediate issue, but random Windows.h macros floating around really isn't ideal.

I guess in the long term it would be better to wrap all Windows.h usages in a way that #include <Windows.h> only occurs in non-unified cpp files.

Comment 3

[Mike Hommey [:glandium]]

I guess in the long term it would be better to wrap all Windows.h usages in a way that #include <Windows.h> only occurs in non-unified cpp files.

We ... actually already have that. Check $objdir/dist/stl_wrappers/windows.h. But that doesn't handle shlwapi.h, which is where GetAcceptLanguages is.

Comment 4

[Mike Hommey [:glandium]]

Attachment: Bug 1812276 - Add a minimal shlwapi.h wrapper, like we do with windows.h.

Comment 5

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/dc600ee31d6f
Add a minimal shlwapi.h wrapper, like we do with windows.h. r=nika

Comment 6

[Serban Stanca [:SerbanS]]

Backed out for causing shlwapi.h related bustages on Windows.

• Backout link
• Push with failures
• Failure Log
• Failure line: gmake[3]: *** [backend.mk:131: dist/stl_wrappers/.deps/shlwapi.h.stub] Error 1

Comment 7

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/integration/autoland/rev/213ac6d669bb
Add a minimal shlwapi.h wrapper, like we do with windows.h. r=nika

Comment 8

[Narcis Beleuzu [:NarcisB]]

https://hg.mozilla.org/mozilla-central/rev/213ac6d669bb