From c8068e1b9169f50652716aecfc1aa1acda920db3 Mon Sep 17 00:00:00 2001 From: "peterlubczynski%netscape.com" Date: Sat, 30 Jun 2001 21:23:51 +0000 Subject: [PATCH] Fixing Fizilla bustage for the meantime... --- modules/plugin/base/src/ns4xPlugin.cpp | 3 ++- modules/plugin/nglsrc/ns4xPlugin.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/modules/plugin/base/src/ns4xPlugin.cpp b/modules/plugin/base/src/ns4xPlugin.cpp index 811e7539e8f1..074045014b83 100644 --- a/modules/plugin/base/src/ns4xPlugin.cpp +++ b/modules/plugin/base/src/ns4xPlugin.cpp @@ -140,7 +140,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 // !TARGET_CARBON + if(pfnMain == NULL) { @@ -159,6 +159,7 @@ ns4xPlugin::ns4xPlugin(NPPluginFuncs* callbacks, PRLibrary* aLibrary, NP_PLUGINS { return; } +#endif // !TARGET_CARBON #else // for everyone else memcpy((void*) &fCallbacks, (void*) callbacks, sizeof(fCallbacks)); fShutdownEntry = aShutdown; diff --git a/modules/plugin/nglsrc/ns4xPlugin.cpp b/modules/plugin/nglsrc/ns4xPlugin.cpp index 811e7539e8f1..074045014b83 100644 --- a/modules/plugin/nglsrc/ns4xPlugin.cpp +++ b/modules/plugin/nglsrc/ns4xPlugin.cpp @@ -140,7 +140,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 // !TARGET_CARBON + if(pfnMain == NULL) { @@ -159,6 +159,7 @@ ns4xPlugin::ns4xPlugin(NPPluginFuncs* callbacks, PRLibrary* aLibrary, NP_PLUGINS { return; } +#endif // !TARGET_CARBON #else // for everyone else memcpy((void*) &fCallbacks, (void*) callbacks, sizeof(fCallbacks)); fShutdownEntry = aShutdown;