diff options
| author | Oliver Bolte <obo@openoffice.org> | 2008-07-22 15:56:22 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2008-07-22 15:56:22 +0000 |
| commit | f352a454aa5f175411ca38c58eaaf02ad7a7a16c (patch) | |
| tree | 3ea1b00e9cbbb245af9f67430f7a4c08ea377b9b /jvmfwk | |
| parent | 9ccb98c75cc940aeb4c58c61d8226d5bb62e11dc (diff) | |
INTEGRATION: CWS os2port03 (1.8.18); FILE MERGED
2008/07/16 12:25:32 obr 1.8.18.2: RESYNC: (1.8-1.9); FILE MERGED
2008/01/14 16:56:58 ydario 1.8.18.1: os2 needs different order for dll.
Issue number:i85203
Submitted by:ydario
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index b5cc21caddb8..fec7d0b60136 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: sunjre.cxx,v $ - * $Revision: 1.9 $ + * $Revision: 1.10 $ * * This file is part of OpenOffice.org. * @@ -68,10 +68,14 @@ char const* const* SunInfo::getJavaExePaths(int * size) char const* const* SunInfo::getRuntimePaths(int * size) { static char const* ar[]= { -#if defined(WNT) || defined(OS2) +#if defined(WNT) "/bin/client/jvm.dll", "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll" +#elif defined(OS2) + "/bin/classic/jvm.dll", + "/bin/client/jvm.dll", + "/bin/hotspot/jvm.dll" #elif UNX "/lib/" JFW_PLUGIN_ARCH "/client/libjvm.so", "/lib/" JFW_PLUGIN_ARCH "/server/libjvm.so", |