Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

enable OJI on unix.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@26696 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
toshok%hungry.com 1999-04-07 05:14:40 +00:00
parent 0c167870e1
commit b80f6350b3
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/content/html/content/src/nsHTMLAppletElement.cpp
View File

@ -30,7 +30,7 @@
#include "nsIPresShell.h"
#include "nsIFrame.h"
#if defined(OJI) && !defined(XP_UNIX)
#if defined(OJI)
#include "nsIServiceManager.h"
#include "nsIJVMManager.h"
#include "nsILiveConnectManager.h"
@ -251,7 +251,7 @@ nsHTMLAppletElement::GetStyleHintForAttributeChange(
return NS_OK;
}
#if defined(OJI) && !defined(XP_UNIX)
#if defined(OJI)
extern nsresult NS_GetObjectFramePluginInstance(nsIFrame* aFrame, nsIPluginInstance*& aPluginInstance);
#endif
@ -266,7 +266,7 @@ NS_IMETHODIMP
nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
void** aScriptObject)
{
#if defined(OJI) && !defined(XP_UNIX)
#if defined(OJI)
nsresult rv = NS_OK;
if (!mReflectedApplet) {
// 1. get the script object corresponding to the <APPLET> element itself.

6
mozilla/dom/src/base/nsJSEnvironment.cpp
View File

@ -34,7 +34,7 @@
#include "nsDOMCID.h"
#include "nsIServiceManager.h"
#if defined(OJI) && !defined(XP_UNIX)
#if defined(OJI)
#include "nsIJVMManager.h"
#include "nsILiveConnectManager.h"
#endif
@ -210,7 +210,7 @@ nsJSContext::InitializeLiveConnectClasses()
{
nsresult result = NS_OK;
#if defined(OJI) && !defined(XP_UNIX)
#if defined(OJI)
nsILiveConnectManager* manager = NULL;
result = nsServiceManager::GetService(nsIJVMManager::GetCID(),
nsILiveConnectManager::GetIID(),
@ -374,7 +374,7 @@ nsJSEnvironment::nsJSEnvironment()
{
mRuntime = JS_Init(gGCSize);
#if defined(OJI) && !defined(XP_UNIX)
#if defined(OJI)
// Initialize LiveConnect.
nsILiveConnectManager* manager = NULL;
nsresult result = nsServiceManager::GetService(nsIJVMManager::GetCID(),

6
mozilla/layout/html/content/src/nsHTMLAppletElement.cpp
View File

@ -30,7 +30,7 @@
#include "nsIPresShell.h"
#include "nsIFrame.h"
#if defined(OJI) && !defined(XP_UNIX)
#if defined(OJI)
#include "nsIServiceManager.h"
#include "nsIJVMManager.h"
#include "nsILiveConnectManager.h"
@ -251,7 +251,7 @@ nsHTMLAppletElement::GetStyleHintForAttributeChange(
return NS_OK;
}
#if defined(OJI) && !defined(XP_UNIX)
#if defined(OJI)
extern nsresult NS_GetObjectFramePluginInstance(nsIFrame* aFrame, nsIPluginInstance*& aPluginInstance);
#endif
@ -266,7 +266,7 @@ NS_IMETHODIMP
nsHTMLAppletElement::GetScriptObject(nsIScriptContext* aContext,
void** aScriptObject)
{
#if defined(OJI) && !defined(XP_UNIX)
#if defined(OJI)
nsresult rv = NS_OK;
if (!mReflectedApplet) {
// 1. get the script object corresponding to the <APPLET> element itself.