diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:27:03 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:27:03 +0000 |
| commit | e825bcd618d1b864ebd5ecfa542e988d9cd3472f (patch) | |
| tree | 40a28ffd0c66906970915fdf2d679515343481a5 /jvmfwk/plugins | |
| parent | c575425583868d074f63168ad69f47b1884b518c (diff) | |
INTEGRATION: CWS os2port02 (1.13.36); FILE MERGED
2007/09/30 13:27:09 ydario 1.13.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/plugins')
| -rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx index ff566d0bcb7a..75b0cbe74c10 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/otherjre.cxx @@ -4,9 +4,9 @@ * * $RCSfile: otherjre.cxx,v $ * - * $Revision: 1.13 $ + * $Revision: 1.14 $ * - * last change: $Author: obo $ $Date: 2006-09-16 17:45:42 $ + * last change: $Author: hr $ $Date: 2007-11-02 12:27:03 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -55,7 +55,7 @@ Reference<VendorBase> OtherInfo::createInstance() char const* const* OtherInfo::getJavaExePaths(int * size) { static char const * ar[] = { -#ifdef WNT +#if defined(WNT) || defined(OS2) "bin/java.exe", "jre/bin/java.exe" #elif UNX @@ -70,7 +70,7 @@ char const* const* OtherInfo::getJavaExePaths(int * size) char const* const* OtherInfo::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", |