From 004c7abb79dcdf01ed93cf3b7cb94d0f956dd189 Mon Sep 17 00:00:00 2001
From: "blizzard%appliedtheory.com"
 <blizzard%appliedtheory.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 22 Sep 1998 02:26:12 +0000
Subject: [PATCH] Only build liveconnect methods if OJI is defined

git-svn-id: svn://10.0.0.236/trunk@10664 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/modules/plugin/src/nsplugin.cpp | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mozilla/modules/plugin/src/nsplugin.cpp b/mozilla/modules/plugin/src/nsplugin.cpp
index 30ca928c795..86bd2b82d23 100644
--- a/mozilla/modules/plugin/src/nsplugin.cpp
+++ b/mozilla/modules/plugin/src/nsplugin.cpp
@@ -30,6 +30,7 @@
 #ifdef OJI
 #include "nsplugin.h"
 #include "jvmmgr.h" 
+#include "nsILiveconnect.h"
 #endif
 #include "plstr.h" /* PL_strcasecmp */
 
@@ -50,7 +51,6 @@
 #include "nsMalloc.h"
 #include "nsICapsManager.h"
 #include "nsCCapsManager.h"
-#include "nsILiveconnect.h"
 
 #include "intl_csi.h"
 
@@ -298,12 +298,12 @@ nsPluginManager::GetCapsManager(const nsIID& aIID)
     return result;
 }
 
+#ifdef OJI
 nsILiveconnect*
 nsPluginManager::GetLiveconnect(const nsIID& aIID)
 {
     nsILiveconnect* result = NULL;
     PRThread       *threadAttached = NULL;
-#ifdef OJI
     nsresult        err    = NS_OK;
     if (fLiveconnect == NULL) {
 	     if ( PR_GetCurrentThread() == NULL )
@@ -327,9 +327,9 @@ nsPluginManager::GetLiveconnect(const nsIID& aIID)
      {
        PR_DetachThread();
      }
-#endif
     return result;
 }
+#endif