737986 - Win wifi headers conflict with the new Win8 SDK

Status: RESOLVED FIXED

(Core :: Networking, defect)

Description

[Jim Mathies [:jimm]]

http://hg.mozilla.org/projects/elm/rev/9c985bdad2f1

Note this isn't the proper fix, instead of checking for MOZ_WIN8METRO, this should be checking for the 602 sdk.

Comment 1

[Jim Mathies [:jimm]]

(In reply to Masatoshi Kimura [:emk] from comment #30)
> Comment on attachment 605186 [details] [diff] [review]
> wifi code header fixes
> 
> > +#ifndef MOZ_WIN8METRO
> > +#include <ntddndis.h>
> > +#include <winioctl.h>
> > +#endif
> Are these headers even required? No one refer APIs in those headers after
> bug 600235.

Might not be, I'll test on a regular mc build.

Comment 2

[Jim Mathies [:jimm]]

Attachment: fix

These are no longer needed for our normal desktop builds.

Comment 3

[Doug Turner (:dougt)]

make sure things continue to build :)

Comment 4

[Jim Mathies [:jimm]]

It built locally without those headers, but I'll throw all of these at try to be safe.

Comment 5

[Doug Turner (:dougt)]

sounds like you've done this before... :D

Comment 6

[Jim Mathies [:jimm]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/90e47dac65b6

Comment 7

[Marco Bonardo [:mak]]

https://hg.mozilla.org/mozilla-central/rev/90e47dac65b6