summaryrefslogtreecommitdiff
path: root/jvmfwk
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2006-07-19 08:37:51 +0000
committerKurt Zenker <kz@openoffice.org>2006-07-19 08:37:51 +0000
commitc3ceb53873404cb50a7d2bbbcf825556f86d1dfa (patch)
tree6171805cf032456bcc8df804e6a797cf992f3824 /jvmfwk
parent497aae4210a27da4c7eb34384130bd422e13afeb (diff)
INTEGRATION: CWS freebsd07 (1.5.6); FILE MERGED
2006/07/01 06:09:53 maho 1.5.6.1: #i65511# add searchpath for server-only versions of 64bit JDKs.\n This commit is a result of hacks at the CodeFest Akihabara 2006 hosted by FSIJ.
Diffstat (limited to 'jvmfwk')
-rw-r--r--jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx5
1 files changed, 3 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
index 933021bc9c81..e363a42a0986 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: sunjre.cxx,v $
*
- * $Revision: 1.5 $
+ * $Revision: 1.6 $
*
- * last change: $Author: hr $ $Date: 2006-06-20 00:09:26 $
+ * last change: $Author: kz $ $Date: 2006-07-19 09:37:51 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -76,6 +76,7 @@ char const* const* SunInfo::getRuntimePaths(int * size)
"/bin/classic/jvm.dll"
#elif UNX
"/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so",
+ "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so",
"/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so"
#endif