220692 - Syntax error in /js/src/xpconnect/xpcmodule.cpp if MOZ_JSLOADER not defined

Status: VERIFIED FIXED

(Core :: XPConnect, defect)

Description

[Eric Bellotti]

User-Agent:       Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.5a) Gecko/20030728 Mozilla Firebird/0.6.1
Build Identifier: 

/js/src/xpconnect/xpcmodule.cpp, line 85 ends with a comma.  This is OK if
MOZ_JSLOADER is defined, but if it isn't, there is an extra comma which causes
the compiler to cough. see DIFF below, comma should be inside #ifdef block.

85c85
<   {nsnull, XPCVARIANT_CID,                       XPCVARIANT_CONTRACTID,
 nsnull, nsnull, nsnull, nsnull, NS_CI_INTERFACE_GETTER_NAME(XPCVariant), nsnull
, &NS_CLASSINFO_NAME(XPCVariant)},
---
>   {nsnull, XPCVARIANT_CID,                       XPCVARIANT_CONTRACTID,
 nsnull, nsnull, nsnull, nsnull, NS_CI_INTERFACE_GETTER_NAME(XPCVariant), nsnull
, &NS_CLASSINFO_NAME(XPCVariant)}
89c89
<   { "JS component loader", MOZJSCOMPONENTLOADER_CID,
---
>   ,{ "JS component loader", MOZJSCOMPONENTLOADER_CID,

Reproducible: Always

Steps to Reproduce:
Use MozillaFirebird-source-0.6.1.tar.  Make sure MOZ_JSLOADER is not defined.
Possibly fixed in latest CVS--I did not check.

Comment 1

[David Bradley]

Oh, hmm, you're right.

Comment 2

[David Bradley]

Attachment: Move the commas

Moves all the commas in the #ifdef's. Oddly enough I think VC++ lets this pass.
I know it does for enum's.

Comment 3

[timeless]

Comment on attachment 132376 [details] [diff] [review]
Move the commas

brendan loves braces and commas

Comment 4

[Brendan Eich [:brendan]]

Comment on attachment 132376 [details] [diff] [review]
Move the commas

Ugly.  It would look slightly better to unindent the ,{ one space, so the first
initializer within the inner braces starts in the same column as those on the
overflow lines.

Fix that and sr=me.

/be

Comment 5

[David Bradley]

Patch checked in

Comment 6

[Phil Schwartau]

Checkin verified -

Comment 7

[David Bradley]

*** Bug 223487 has been marked as a duplicate of this bug. ***