diff options
| author | Kurt Zenker <kz@openoffice.org> | 2005-05-31 16:06:09 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2005-05-31 16:06:09 +0000 |
| commit | 68d715d7ad349f18e91f4dc768fdd9d45a9d13cc (patch) | |
| tree | f47b580f7792bb143d96fa9d7e04b33daf343e3e /jvmfwk | |
| parent | 1f9b51d89b008f56f5e8658c42c2472b3096673e (diff) | |
INTEGRATION: CWS macosx07 (1.5.2); FILE MERGED
2005/05/19 14:25:34 ericb 1.5.2.2: #i49486# delete typo (extra + symbol) in otherjre.cxx
2005/05/19 13:50:02 ericb 1.5.2.1: #i49486# fix a typo in otherjre.cxx for PowerPC arch LinuxPPC and Mac OSX
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index 75cbc0d6079b..6abee1f2d110 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -2,9 +2,9 @@ * * $RCSfile: otherjre.cxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-05-11 11:31:21 $ + * last change: $Author: kz $ $Date: 2005-05-31 17:06:09 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -98,14 +98,12 @@ char const* const* OtherInfo::getRuntimePaths(int * size) "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll" #elif UNX -#ifdef MACOSX - "/../../../JavaVM" -#endif #if defined(LINUX) && defined(POWERPC) "/bin/classic/libjvm.so", - "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so" // for Blackdown PPC + "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", // for Blackdown PPC "/lib/" JFW_PLUGIN_ARCH "/classic/libjvm.so" // for Blackdown PPC - +#elif defined(MACOSX) + "/../../../JavaVM" #else "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", |