diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:27:38 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2007-11-02 11:27:38 +0000 |
| commit | f10bc5377215ff982b9496b92acbdf5ebd4850b4 (patch) | |
| tree | 73d3de9015e8b0c6d17df332df522c1afadecd0d /jvmfwk | |
| parent | 53af43badf90c49fea5a8565ea26403c3565eaad (diff) | |
INTEGRATION: CWS os2port02 (1.6.36); FILE MERGED
2007/09/30 13:27:09 ydario 1.6.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/vendorbase.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx index eb600ce14adb..d4218797ed53 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorbase.cxx @@ -4,9 +4,9 @@ * * $RCSfile: vendorbase.cxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: obo $ $Date: 2006-09-16 17:47:02 $ + * last change: $Author: hr $ $Date: 2007-11-02 12:27:38 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -82,7 +82,7 @@ VendorBase::VendorBase(): m_bAccessibility(false) char const* const * VendorBase::getJavaExePaths(int* size) { static char const * ar[] = { -#ifdef WNT +#if defined(WNT) || defined(OS2) "java.exe", "bin/java.exe" #elif UNX |