1665160 - "dom/base/nsDocumentEncoder.cpp(1739,48): error: expected unqualified-id" build bustage with --disable-accessibility

Status: RESOLVED WORKSFORME

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

Description

[Ryan VanderMeulen [:RyanVM]]

The changes to nsDOMNavigationTiming.cpp from bug 1657188 are triggering local build bustage for me:
https://hg.mozilla.org/integration/autoland/diff/dc8d6a216ffa28165acaf67ddc2e88974d95a8e9/dom/base/nsDOMNavigationTiming.cpp

In file included from Unified_cpp_dom_base8.cpp:38:
C:/Users/Ryan/repos/mozilla/dom/base/nsDocumentEncoder.cpp(1739,48): error: expected unqualified-id
      nsGkAtoms::s, nsGkAtoms::big, nsGkAtoms::small, nsGkAtoms::strike,
                                               ^
C:\Program Files (x86)\Windows Kits\10\include\10.0.19041.0\shared/rpcndr.h(190,15): note: expanded from macro 'small'
#define small char
              ^

Talking to Barret about it on Slack, this is probably due to the newly-added includes bringing in windows.h somewhere it didn't used to be. While this is currently only affecting my local build, this can presumably strike in CI at some point in the future if/when the unified file boundaries change from where they currently are.

Comment 1

[Ryan VanderMeulen [:RyanVM]]

Attachment: Bug 1665160 - Work around Windows SDK unified build bustage.

Comment 2

[Ryan VanderMeulen [:RyanVM]]

The attached patch works locally. We could also probably move nsDOMNavigationTiming.cpp out of UNIFIED_FILES to hack around this if the undef option isn't preferred.

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Also, this is trivially-reproducible on Try by disabling a11y.
https://treeherder.mozilla.org/logviewer.html#/jobs?job_id=316081734&repo=try&lineNumber=19140

Comment 4

[Ryan VanderMeulen [:RyanVM]]

This was "fixed" by way of bug 1679422 moving nsDocumentEncoder.cpp to a different directory and changing the unified build layout enough to avoid the problematic arrangement.