536269 - [OS/2] build break in xpcom/build/dlldeps.cpp after fixing a win only crasher

Status: RESOLVED FIXED

(Core :: XPCOM, defect)

Description

[Walter Meinl]

User-Agent:       Mozilla/5.0 (OS/2; U; Warp 4.5; en-US; rv:1.9.3a1pre) Gecko/20091221 Minefield/3.7a1pre
Build Identifier: 

OS/2 uses the xpcom/build/dlldeps.cpp file as well as win. Several parts not used are in ifndef XP_OS2 or ifdef XP_WIN. In trying to find a top crasher on windows some new XP_WIN only code was introduced to trace the crasher. However, changes to dlldeps.cpp were put in a section os2 would try to compile as well -> break.

Reproducible: Always

Comment 1

[Walter Meinl]

Attachment: move the new windows bits into a !XP_OS2 place

Comment 2

[Benjamin Smedberg]

Comment on attachment 418731 [details] [diff] [review]
move the new windows bits into a !XP_OS2 place

Why are you using #if !defined(XP_OS2) here, instead of #ifdef XP_WIN? The actual declaration of sXPCOMHasLoadedNewDLLs is #ifdef XP_WIN.

Comment 3

[Walter Meinl]

(In reply to comment #2)
> (From update of attachment 418731 [details] [diff] [review])
> Why are you using #if !defined(XP_OS2) here, instead of #ifdef XP_WIN? The
> actual declaration of sXPCOMHasLoadedNewDLLs is #ifdef XP_WIN.
When you look at the whole file, there was always used !defined(XP_OS2) or ifndef XP_OS2, and actually I moved an existing !defined(XP_OS2) just two lines upwards. If you like it more, I can overhaul the whole file to use ifdef XP_WIN instead.

Comment 4

[Walter Meinl]

Attachment: reorder the file a bit, s/if !defined(XP_OS2)/ifdef XP_WIN

I've replaced all the !defined(XP_OS2) against ifdef XP_WIN, which is better readable.

Comment 5

[Kyle Huey (Exited; not receiving bugmail, old account, do not use)]

http://hg.mozilla.org/mozilla-central/rev/bcbbe25e3ae2