Patch contributed by Michal Ceresna and verified by John Marmion.

This patch makes the webclient trunk work with the MOZILLA_0_9_9_BRANCH
on linux.


git-svn-id: svn://10.0.0.236/trunk@122500 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2002-06-01 19:11:44 +00:00
parent b1e8ad1cac
commit dca1ac3c28
11 changed files with 79 additions and 29 deletions

View File

@@ -546,11 +546,7 @@ JNIEnv* nsJavaDOMImpl::GetJNIEnv() {
if (!jvm) {
StartJVM();
}
#ifdef XP_PC
jvm->AttachCurrentThread((void**)&env,NULL);
#else
jvm->AttachCurrentThread(&env,NULL);
#endif
#endif /* JAVA_DOM_OJI_ENABLE */
return env;
}
@@ -596,11 +592,7 @@ void nsJavaDOMImpl::StartJVM(void) {
#ifdef DEBUG
printf("classpath is \"%s\"\n", vm_args.classpath);
#endif // DEBUG
#ifdef XP_PC
jint rv = JNI_CreateJavaVM(&jvm, (void**)&env, &vm_args);
#else
jint rv = JNI_CreateJavaVM(&jvm, &env, &vm_args);
#endif
if (rv < 0) {
printf("\n JAVA DOM: could not start jvm\n");
} else {