849198 - nsPluginSafety.h compilation failure on mingw

Status: RESOLVED FIXED

(Core Graveyard :: Plug-ins, defect)

Description

[Jacek Caban]

Attachment: fix

GCC can't handle forward enum declaration like:

enum NSPluginCallReentry;

That enum requires previous proper declaration, which is in nsNPAPIPluginInstance.h. It means that nsNPAPIPluginInstance.h needs to be included before nsPluginSafety.h, which seems to be maintained in the code, with an exception of recent brackage in nsPluginNativeWindowWin.cpp (which is tested only with MSVC). Instead of making sure includes are done in the right order, it seems cleaner to simply include nsNPAPIPluginInstance.h in nsPluginSafety.h.

BTW, I was also considering merging nsPluginSafety.h into nsNPAPIPluginInstance.h, since nsPluginSafety.h is pretty small and doesn't relly need a separate header. If that would be prefferable, let me know.

Comment 1

[Robert O'Callahan (:roc) (email my personal email if necessary)]

(In reply to Jacek Caban from comment #0)
> BTW, I was also considering merging nsPluginSafety.h into
> nsNPAPIPluginInstance.h, since nsPluginSafety.h is pretty small and doesn't
> relly need a separate header. If that would be prefferable, let me know.

Yes, let's do that please. Thanks!!!

Comment 2

[Jacek Caban]

Attachment: Merge nsPluginSafety.h into nsNPAPIPluginInstance.h

OK, here is a patch moving nsPluginSafety.h's content into nsNPAPIPluginInstance.h. I ran it through try to make sure I didn't miss anything:

https://tbpl.mozilla.org/?tree=Try&rev=68a4935765de

Comment 3

[Jacek Caban]

https://hg.mozilla.org/integration/mozilla-inbound/rev/80e584c6ac74

Comment 4

[Ryan VanderMeulen [:RyanVM]]

https://hg.mozilla.org/mozilla-central/rev/80e584c6ac74