192584 - Don't include <wingdi.h> twice

Status: VERIFIED FIXED

(Core Graveyard :: Profile: Migration, defect)

Description

[David G King]

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.3b) Gecko/20030203
Build Identifier: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.3b) Gecko/20030203

In nsTridentPreferencesWin.cpp there is an include of <windows.h> and one for
<wingdi.h>. However, <windows.h> includes <wingdi.h> itself, so we end up with
<wingdi.h> included twice.

Reproducible: Always

Steps to Reproduce:

Comment 1

[David G King]

The fix is really simple, and I'm testing it now.....taking.

Comment 2

[David G King]

Attachment: Remove dup <wingdi.h>

Comment 3

[(not reading, please use [e-mail] instead)]

Comment on attachment 114041 [details] [diff] [review]
Remove dup <wingdi.h>

the owner of this code is danm.

Comment 4

[Dan M]

Comment on attachment 114041 [details] [diff] [review]
Remove dup <wingdi.h>

wingdi.h is for EnumFontFamiliesEx() but windows.h is the correct #include for
that. r=danm.

danm disavows all other knowledge of this code.

Comment 5

[(not reading, please use [e-mail] instead)]

Comment on attachment 114041 [details] [diff] [review]
Remove dup <wingdi.h>

since you got r=danm, rs=sspitzer

no need to waste ccarlen's cycles on this.

Comment 6

[David G King]

Update: as I don't have CVS checkin privs, I've asked sspitzer to check this in
when he has time and the tree is open.

Comment 7

[David G King]

Changing milestone as there is no way this could be considered critical for 1.4a
and bothering "drivers" with it.

Comment 8

[Dan M]

Checked in. Thanks David!

Comment 9

[David G King]

Verifying via lxr and bonsai and lack of redness caused by this checkin. A minor
bug for sure, but it had to be done.

Found some interesting discrepencies. For example :-
http://lxr.mozilla.org/mozilla/source/extensions/tridentprofile/src/nsTridentPreferencesWin.cpp
&
http://lxr.mozilla.org/seamonkey/source/extensions/tridentprofile/src/nsTridentPreferencesWin.cpp

are different, with the seamonkey version having the change, but the other one
doesn't. I assume I'm just getting confused as I dig further into Mozilla, so I
wont file a bug unless someone suggests I should.