895083 - Win64 builds fail because we only have __fastcall

Status: RESOLVED FIXED

(Core :: XPCOM, defect)

Description

[(no longer active)]

e:\builds\moz2_slave\date-w64-000000000000000000000\build\xpcom\glue\nsThreadUtils.h(330) : error C2953: 'nsRunnableMethodTraits<R(__cdecl C::* )(void),Owning>' : class template has already been defined
e:\builds\moz2_slave\date-w64-000000000000000000000\build\xpcom\glue\nsThreadUtils.h(330) : error C2953: 'nsRunnableMethodTraits<R(__cdecl C::* )(void),Owning>' : class template has already been defined 

https://tbpl.mozilla.org/?tree=Date&rev=604c8518cc50

Comment 1

[(no longer active)]

Attachment: Patch (v1)

Before: https://tbpl.mozilla.org/?tree=Try&rev=a39733995537
After: https://tbpl.mozilla.org/?tree=Try&rev=c6108d96f25f

Comment 2

[[e-mail]]

Wouldn't it make more sense to wrap the #defined NS_HAVE_STDCALL in an ifndef WIN64 block so that people don't run into this again?

Comment 3

[Vladimir Vukicevic [:vlad] [:vladv] (needinfo me, slow to respond)]

Comment on attachment 777352 [details] [diff] [review]
Patch (v1)

Looks fine, though I also like just not defining NS_HAVE_STDCALL as Neil suggests. (This is literally the only use of NS_HAVE_STDCALL in the tree.)

Comment 4

[(no longer active)]

That feels a bit wrong to me, since the __stdcall keyword is still there, it's just ignored by the compiler for codegen and template resolution.  But the argument that this will recur in the future is probably correct.  I guess I'll do that then.

Comment 5

[(no longer active)]

Attachment: For check-in

Comment 6

[Benoit Girard (:BenWa)]

Thanks ehsan

Comment 7

[Mike Hommey [:glandium]]

If WIN64 ignores __stdcall, why keep NS_STDCALL non-empty on WIN64?

Comment 8

[Mike Hommey [:glandium]]

(In reply to Mike Hommey [:glandium] from comment #7)
> If WIN64 ignores __stdcall, why keep NS_STDCALL non-empty on WIN64?

At least it wouldn't feel weird to have NS_STDCALL saying one thing and NS_HAVE_STDCALL saying another.

Comment 9

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/8bc7cd7071b2

Comment 10

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/8bc7cd7071b2

Comment 11

[Mike Hommey [:glandium]]

Attachment: Set NS_STDCALL to nothing on WIN64

cf. comment 7 and 8.

Comment 12

[Mike Hommey [:glandium]]

https://hg.mozilla.org/integration/mozilla-inbound/rev/86b7630f73e0

Comment 13

[Ed Morley [:emorley]]

https://hg.mozilla.org/mozilla-central/rev/86b7630f73e0