From 832cb868ca8052d3889f18220ea6f25eb5716c82 Mon Sep 17 00:00:00 2001
From: "seawood%netscape.com"
 <seawood%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Thu, 8 May 2003 06:59:16 +0000
Subject: [PATCH] Fixing --disable-oji mac bustage. Bug #204647 r=peterl
 sr=sfraser a=asa

git-svn-id: svn://10.0.0.236/trunk@142195 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../modules/plugin/samples/default/mac/NullPlugin.cpp |  3 ++-
 mozilla/modules/plugin/samples/default/mac/npmac.cpp  | 11 ++++++++---
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/mozilla/modules/plugin/samples/default/mac/NullPlugin.cpp b/mozilla/modules/plugin/samples/default/mac/NullPlugin.cpp
index d5ef21a5843..db9782c9d40 100644
--- a/mozilla/modules/plugin/samples/default/mac/NullPlugin.cpp
+++ b/mozilla/modules/plugin/samples/default/mac/NullPlugin.cpp
@@ -394,7 +394,7 @@ void NPP_URLNotify(NPP /*instance*/, const char* /*url*/, NPReason /*reason*/, v
 {
 }
 
-
+#ifdef OJI
 //------------------------------------------------------------------------------------
 // NPP_GetJavaClass:
 //------------------------------------------------------------------------------------
@@ -402,6 +402,7 @@ jref NPP_GetJavaClass(void)
 {
 	return NULL;
 }
+#endif /* OJI */
 
 #pragma mark -
 
diff --git a/mozilla/modules/plugin/samples/default/mac/npmac.cpp b/mozilla/modules/plugin/samples/default/mac/npmac.cpp
index da00bfe9d26..a3ea6f22930 100644
--- a/mozilla/modules/plugin/samples/default/mac/npmac.cpp
+++ b/mozilla/modules/plugin/samples/default/mac/npmac.cpp
@@ -332,7 +332,7 @@ void NPN_ReloadPlugins(NPBool reloadPages)
 	CallNPN_ReloadPluginsProc(gNetscapeFuncs.reloadplugins, reloadPages);
 }
 
-
+#ifdef OJI
 JRIEnv* NPN_GetJavaEnv(void)
 {
 	return CallNPN_GetJavaEnvProc( gNetscapeFuncs.getJavaEnv );
@@ -342,6 +342,7 @@ jobject  NPN_GetJavaPeer(NPP instance)
 {
 	return CallNPN_GetJavaPeerProc( gNetscapeFuncs.getJavaPeer, instance );
 }
+#endif
 
 NPError NPN_GetValue(NPP instance, NPNVariable variable, void *value)
 {
@@ -524,7 +525,7 @@ void Private_URLNotify(NPP instance, const char* url, NPReason reason, void* not
 	ExitCodeResource();
 }
 
-
+#ifdef OJI
 jobject Private_GetJavaClass(void)
 {
 	EnterCodeResource();
@@ -539,7 +540,7 @@ jobject Private_GetJavaClass(void)
     }
     return NULL;
 }
-
+#endif
 
 void SetUpQD(void);
 void SetUpQD(void)
@@ -749,10 +750,14 @@ DEFINE_API_C(NPError) main(NPNetscapeFuncs* nsTable, NPPluginFuncs* pluginFuncs,
 		{	
 			pluginFuncs->urlnotify = NewNPP_URLNotifyProc(PLUGIN_TO_HOST_GLUE(urlnotify, Private_URLNotify));			
 		}
+#ifdef OJI
 		if( navMinorVers >= NPVERS_HAS_LIVECONNECT )
 		{
 			pluginFuncs->javaClass	= (JRIGlobalRef) Private_GetJavaClass();
 		}
+#else
+                pluginFuncs->javaClass = NULL;
+#endif
 		*unloadUpp = NewNPP_ShutdownProc(PLUGIN_TO_HOST_GLUE(shutdown, Private_Shutdown));
 
 		SetUpQD();