diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:27:21 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:27:21 +0000 |
| commit | 53af43badf90c49fea5a8565ea26403c3565eaad (patch) | |
| tree | ee78f7ab1bc24dae0b49b63a36fd3ed8eefcaadc /jvmfwk | |
| parent | e825bcd618d1b864ebd5ecfa542e988d9cd3472f (diff) | |
INTEGRATION: CWS os2port02 (1.7.36); FILE MERGED
2007/09/30 13:27:09 ydario 1.7.36.1: Issue number: i82034
Submitted by: ydario
Reviewed by: ydario
Commit of changes for OS/2 CWS source code integration.
Diffstat (limited to 'jvmfwk')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx index 2899b6bd8897..12a754d8e002 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.7 $ + * $Revision: 1.8 $ * - * last change: $Author: obo $ $Date: 2006-09-16 17:46:13 $ + * last change: $Author: hr $ $Date: 2007-11-02 12:27:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -56,7 +56,7 @@ Reference<VendorBase> SunInfo::createInstance() char const* const* SunInfo::getJavaExePaths(int * size) { static char const * ar[] = { -#ifdef WNT +#if defined(WNT) || defined(OS2) "java.exe", "bin/java.exe", "jre/bin/java.exe" @@ -73,7 +73,7 @@ char const* const* SunInfo::getJavaExePaths(int * size) char const* const* SunInfo::getRuntimePaths(int * size) { static char const* ar[]= { -#ifdef WNT +#if defined(WNT) || defined(OS2) "/bin/client/jvm.dll", "/bin/hotspot/jvm.dll", "/bin/classic/jvm.dll" |