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

Enables waterfall to work on Linux Sparc.

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@99445 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
edburns%acm.org
2001-07-17 22:15:21 +00:00
parent 7198e755f7
commit bdc1302c43
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mozilla/java/pluggable-jvm/wf/src/plugin/java_plugin.c
View File

@@ -16,7 +16,7 @@
* Portions created by Sun Microsystems Inc are Copyright (C) 2001
* All Rights Reserved.
*
* $Id: java_plugin.c,v 1.2 2001-07-12 19:58:15 edburns%acm.org Exp $
* $Id: java_plugin.c,v 1.3 2001-07-17 22:15:21 edburns%acm.org Exp $
*
* Contributor(s):
*
@@ -231,7 +231,7 @@ static char* getJDKhome()
static jint loadJVM(const char* name) {
dll_t handle;
char *libpath, *newlibpath, *pluginlibpath;
char *libjvm, *java_home, *jre_home;
char *libjvm, *java_home, *jre_home, *libhpi;
int tmplen;
static int loaded = 0;
@@ -285,12 +285,22 @@ static jint loadJVM(const char* name) {
#ifdef XP_UNIX
sprintf(libjvm, "%s/jre/lib/"ARCH"/"JVMKIND"/%s", JDK_home,
name);
/* this stuff meaningful for strange platforms like Sparc Linux
where libjvm.so uses libhpi.so, but doesn't depends on it */
libhpi = (char*) malloc(strlen(JDK_home)+60);
sprintf(libhpi,
"%s/jre/lib/"ARCH"/native_threads/libhpi.so",
JDK_home
);
/* we don't care about possible errors - just try to load libjvm.so later */
dlopen(libhpi, RTLD_GLOBAL | RTLD_NOW);
free (libhpi);
#else
sprintf(libjvm,
"%s"FILE_SEPARATOR"jre"FILE_SEPARATOR"bin"FILE_SEPARATOR""JVMKIND""FILE_SEPARATOR"%s",
JDK_home, name);
#endif
#endif
putenv(java_home);
putenv(jre_home);