Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Minor changes to fix building on Linux with --enable-oji. r=shaver.

Browse Source
This commit is contained in:
bryner%uiuc.edu 1999-11-29 20:27:00 +00:00
parent 62fc21a701
commit c19f2eda7f
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
js/src/liveconnect/nsCLiveconnect.cpp
View File

@ -114,7 +114,7 @@ NS_METHOD
nsCLiveconnect::GetMember(JNIEnv *jEnv, jsobject obj, const jchar *name, jsize length, void* principalsArray[],
int numPrincipals, void *pNSISecurityContext, jobject *pjobj)
{
if(jEnv == NULL || obj == NULL)
if(jEnv == NULL || obj == 0)
{
return NS_ERROR_FAILURE;
}
@ -169,7 +169,7 @@ NS_METHOD
nsCLiveconnect::GetSlot(JNIEnv *jEnv, jsobject obj, jint slot, void* principalsArray[],
int numPrincipals, void *pNSISecurityContext, jobject *pjobj)
{
if(jEnv == NULL || obj == NULL)
if(jEnv == NULL || obj == 0)
{
return NS_ERROR_FAILURE;
}
@ -218,7 +218,7 @@ NS_METHOD
nsCLiveconnect::SetMember(JNIEnv *jEnv, jsobject obj, const jchar *name, jsize length, jobject java_obj, void* principalsArray[],
int numPrincipals, void *pNSISecurityContext)
{
if(jEnv == NULL || obj == NULL)
if(jEnv == NULL || obj == 0)
{
return NS_ERROR_FAILURE;
}
@ -264,7 +264,7 @@ NS_METHOD
nsCLiveconnect::SetSlot(JNIEnv *jEnv, jsobject obj, jint slot, jobject java_obj, void* principalsArray[],
int numPrincipals, void *pNSISecurityContext)
{
if(jEnv == NULL || obj == NULL)
if(jEnv == NULL || obj == 0)
{
return NS_ERROR_FAILURE;
}
@ -301,7 +301,7 @@ NS_METHOD
nsCLiveconnect::RemoveMember(JNIEnv *jEnv, jsobject obj, const jchar *name, jsize length, void* principalsArray[],
int numPrincipals, void *pNSISecurityContext)
{
if(jEnv == NULL || obj == NULL)
if(jEnv == NULL || obj == 0)
{
return NS_ERROR_FAILURE;
}
@ -342,7 +342,7 @@ NS_METHOD
nsCLiveconnect::Call(JNIEnv *jEnv, jsobject obj, const jchar *name, jsize length, jobjectArray java_args, void* principalsArray[],
int numPrincipals, void *pNSISecurityContext, jobject *pjobj)
{
if(jEnv == NULL || obj == NULL)
if(jEnv == NULL || obj == 0)
{
return NS_ERROR_FAILURE;
}
@ -422,7 +422,7 @@ NS_METHOD
nsCLiveconnect::Eval(JNIEnv *jEnv, jsobject obj, const jchar *script, jsize length, void* principalsArray[],
int numPrincipals, void *pNSISecurityContext, jobject *pjobj)
{
if(jEnv == NULL || obj == NULL)
if(jEnv == NULL || obj == 0)
{
return NS_ERROR_FAILURE;
}
@ -553,7 +553,7 @@ done:
NS_METHOD
nsCLiveconnect::FinalizeJSObject(JNIEnv *jEnv, jsobject obj)
{
if(jEnv == NULL || obj == NULL)
if(jEnv == NULL || obj == 0)
{
return NS_ERROR_FAILURE;
}
@ -571,7 +571,7 @@ nsCLiveconnect::FinalizeJSObject(JNIEnv *jEnv, jsobject obj)
NS_METHOD
nsCLiveconnect::ToString(JNIEnv *jEnv, jsobject obj, jstring *pjstring)
{
if(jEnv == NULL || obj == NULL)
if(jEnv == NULL || obj == 0)
{
return NS_ERROR_FAILURE;
}

2
modules/oji/src/nsJVMManager.cpp
View File

@ -563,7 +563,7 @@ nsJVMManager::StartupJVM(void)
return fStatus;
}
if (pluginHost == NULL) {
if (!pluginHost) {
fStatus = nsJVMStatus_Failed;
return fStatus;
}