[Gnash-commit] /srv/bzr/gnash/trunk r12104: Remove a bunch of DSOEXPORTs, which do not seem to contribute to anything

[Bastiaan Jacques]

------------------------------------------------------------
revno: 12104
committer: Bastiaan Jacques <address@hidden>
branch nick: trunk
timestamp: Wed 2010-03-24 17:37:17 +0100
message:
  Remove a bunch of DSOEXPORTs, which do not seem to contribute to anything
  except the risk of symbol collision.
  npp_gate.cpp: Attempt to slightly increase robustness.
modified:
  plugin/npapi/mozilla-sdk/np_entry.cpp
  plugin/npapi/mozilla-sdk/npp_gate.cpp
  plugin/npapi/mozilla-sdk/pluginbase.h

=== modified file 'plugin/npapi/mozilla-sdk/np_entry.cpp'
--- a/plugin/npapi/mozilla-sdk/np_entry.cpp     2010-03-24 05:33:15 +0000
+++ b/plugin/npapi/mozilla-sdk/np_entry.cpp     2010-03-24 16:37:17 +0000
@@ -25,15 +25,15 @@
 #include "npplat.h"
 #include "pluginbase.h"
 
-DSOEXPORT NPNetscapeFuncs NPNFuncs;
+NPNetscapeFuncs NPNFuncs;
 
-DSOEXPORT NPError OSCALL NP_Shutdown()
+NPError OSCALL NP_Shutdown()
 {
   NS_PluginShutdown();
   return NPERR_NO_ERROR;
 }
 
-static NPError fillPluginFunctionTable(NPPluginFuncs* aNPPFuncs)
+NPError fillPluginFunctionTable(NPPluginFuncs* aNPPFuncs)
 {
   if(aNPPFuncs == NULL)
     return NPERR_INVALID_FUNCTABLE_ERROR;
@@ -79,7 +79,7 @@
   return NPERR_NO_ERROR;
 }
 
-static NPError fillNetscapeFunctionTable(NPNetscapeFuncs* aNPNFuncs)
+NPError fillNetscapeFunctionTable(NPNetscapeFuncs* aNPNFuncs)
 {
   int i = 0, n;
 
@@ -165,7 +165,7 @@
 /**************************************************/
 #ifdef XP_WIN
 
-DSOEXPORT NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs)
+NPError OSCALL NP_Initialize(NPNetscapeFuncs* aNPNFuncs)
 {
   /*
    * N.B.  On Firefox 2.0.0.12/WinXP, aNPNFuncs->size is 172 while
@@ -187,7 +187,7 @@
   return rv2 != NPERR_NO_ERROR ? rv2 : rv;
 }
 
-DSOEXPORT NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* aNPPFuncs)
+NPError OSCALL NP_GetEntryPoints(NPPluginFuncs* aNPPFuncs)
 {
   return fillPluginFunctionTable(aNPPFuncs);
 }
@@ -201,7 +201,7 @@
 /**************************************************/
 #ifdef XP_UNIX
 
-DSOEXPORT NPError NP_Initialize(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* 
aNPPFuncs)
+NPError NP_Initialize(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* aNPPFuncs)
 {
   NPError rv = fillNetscapeFunctionTable(aNPNFuncs);
   if(rv != NPERR_NO_ERROR)
@@ -214,12 +214,12 @@
   return NS_PluginInitialize();
 }
 
-DSOEXPORT char * NP_GetMIMEDescription(void)
+char * NP_GetMIMEDescription(void)
 {
   return NPP_GetMIMEDescription();
 }
 
-DSOEXPORT NPError NP_GetValue(void* /*future*/, NPPVariable aVariable, void 
*aValue)
+NPError NP_GetValue(void* /*future*/, NPPVariable aVariable, void *aValue)
 {
   return NS_PluginGetValue(aVariable, aValue);
 }
@@ -234,26 +234,26 @@
 #ifdef XP_MAC
 
 #if !TARGET_API_MAC_CARBON
-DSOEXPORT QDGlobals* gQDPtr; // Pointer to Netscape's QuickDraw globals
+QDGlobals* gQDPtr; // Pointer to Netscape's QuickDraw globals
 #endif
 
-DSOEXPORT short gResFile; // Refnum of the plugin's resource file
+short gResFile; // Refnum of the plugin's resource file
 
-DSOEXPORT NPError Private_Initialize(void)
+NPError Private_Initialize(void)
 {
   NPError rv = NS_PluginInitialize();
   return rv;
 }
 
-DSOEXPORT void Private_Shutdown(void)
+void Private_Shutdown(void)
 {
   NS_PluginShutdown();
   __destroy_global_chain();
 }
 
-DSOEXPORT void SetUpQD(void);
+void SetUpQD(void);
 
-DSOEXPORT void SetUpQD(void)
+void SetUpQD(void)
 {
   ProcessSerialNumber PSN;
   FSSpec              myFSSpec;
@@ -314,18 +314,18 @@
 #endif /* !TARGET_API_MAC_CARBON */
 }
 
-DSOEXPORT NPError main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs, 
NPP_ShutdownUPP* unloadUpp);
+NPError main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs, 
NPP_ShutdownUPP* unloadUpp);
 
 #if !TARGET_API_MAC_CARBON
 #pragma export on
 #if GENERATINGCFM
-DSOEXPORT RoutineDescriptor mainRD = 
BUILD_ROUTINE_DESCRIPTOR(uppNPP_MainEntryProcInfo, main);
+RoutineDescriptor mainRD = BUILD_ROUTINE_DESCRIPTOR(uppNPP_MainEntryProcInfo, 
main);
 #endif
 #pragma export off
 #endif /* !TARGET_API_MAC_CARBON */
 
 
-DSOEXPORT NPError main(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* aNPPFuncs, 
NPP_ShutdownUPP* aUnloadUpp)
+NPError main(NPNetscapeFuncs* aNPNFuncs, NPPluginFuncs* aNPPFuncs, 
NPP_ShutdownUPP* aUnloadUpp)
 {
   NPError rv = NPERR_NO_ERROR;
 

=== modified file 'plugin/npapi/mozilla-sdk/npp_gate.cpp'
--- a/plugin/npapi/mozilla-sdk/npp_gate.cpp     2010-03-24 05:33:15 +0000
+++ b/plugin/npapi/mozilla-sdk/npp_gate.cpp     2010-03-24 16:37:17 +0000
@@ -91,6 +91,7 @@
   // window just created
   if(!plugin->isInitialized() && (pNPWindow->window != NULL)) { 
     if(!plugin->init(pNPWindow)) {
+      plugin->shut();
       NS_DestroyPluginInstance(plugin);
       return NPERR_MODULE_LOAD_FAILED_ERROR;
     }

=== modified file 'plugin/npapi/mozilla-sdk/pluginbase.h'
--- a/plugin/npapi/mozilla-sdk/pluginbase.h     2010-03-24 05:33:15 +0000
+++ b/plugin/npapi/mozilla-sdk/pluginbase.h     2010-03-24 16:37:17 +0000
@@ -67,16 +67,16 @@
 // functions that should be implemented for each specific plugin
 
 // creation and destruction of the object of the derived class
-DSOEXPORT nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * 
aCreateDataStruct);
-DSOEXPORT void NS_DestroyPluginInstance(nsPluginInstanceBase * aPlugin);
+nsPluginInstanceBase * NS_NewPluginInstance(nsPluginCreateData * 
aCreateDataStruct);
+void NS_DestroyPluginInstance(nsPluginInstanceBase * aPlugin);
 
 // global plugin initialization and shutdown
-DSOEXPORT NPError NS_PluginInitialize();
-DSOEXPORT void NS_PluginShutdown();
+NPError NS_PluginInitialize();
+void NS_PluginShutdown();
 
 #ifdef XP_UNIX
 // global to get plugins name & description 
-DSOEXPORT NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue);
+NPError NS_PluginGetValue(NPPVariable aVariable, void *aValue);
 #endif
 
 #endif // __PLUGININSTANCEBASE_H__