From 2eb94bdec7908bd8bfbe695f7ccc1763877bb3ab Mon Sep 17 00:00:00 2001 From: "peterlubczynski%netscape.com" Date: Fri, 29 Jun 2001 09:58:24 +0000 Subject: [PATCH] another attempt to fix Carbon bustage git-svn-id: svn://10.0.0.236/trunk@98270 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/modules/plugin/base/src/ns4xPlugin.cpp | 3 ++- mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp index e345424c64c..8395029f08e 100644 --- a/mozilla/modules/plugin/base/src/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/base/src/ns4xPlugin.cpp @@ -141,7 +141,7 @@ ns4xPlugin::ns4xPlugin(NPPluginFuncs* callbacks, PRLibrary* aLibrary, NP_PLUGINS NP_MAIN pfnMain = (NP_MAIN) PR_FindSymbol(aLibrary, "main"); #else NP_MAIN pfnMain = (NP_MAIN) PR_FindSymbol(aLibrary, "mainRD"); -#endif + if(pfnMain == NULL) { @@ -160,6 +160,7 @@ ns4xPlugin::ns4xPlugin(NPPluginFuncs* callbacks, PRLibrary* aLibrary, NP_PLUGINS { return; } +#endif // !TARGET_CARBON // XXX temporaryly disable plugins so it'll compile #else // for everyone else memcpy((void*) &fCallbacks, (void*) callbacks, sizeof(fCallbacks)); fShutdownEntry = aShutdown; diff --git a/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp b/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp index e345424c64c..8395029f08e 100644 --- a/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp +++ b/mozilla/modules/plugin/nglsrc/ns4xPlugin.cpp @@ -141,7 +141,7 @@ ns4xPlugin::ns4xPlugin(NPPluginFuncs* callbacks, PRLibrary* aLibrary, NP_PLUGINS NP_MAIN pfnMain = (NP_MAIN) PR_FindSymbol(aLibrary, "main"); #else NP_MAIN pfnMain = (NP_MAIN) PR_FindSymbol(aLibrary, "mainRD"); -#endif + if(pfnMain == NULL) { @@ -160,6 +160,7 @@ ns4xPlugin::ns4xPlugin(NPPluginFuncs* callbacks, PRLibrary* aLibrary, NP_PLUGINS { return; } +#endif // !TARGET_CARBON // XXX temporaryly disable plugins so it'll compile #else // for everyone else memcpy((void*) &fCallbacks, (void*) callbacks, sizeof(fCallbacks)); fShutdownEntry = aShutdown;