mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS os2port02 (1.7.36); FILE MERGED

Browse Source 
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.
This commit is contained in:
Jens-Heiner Rechtien
2007-11-02 11:27:21 +00:00
parent e825bcd618
commit 53af43badf
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
jvmfwk/plugins/sunmajor/pluginlib/sunjre.cxx
View File

@@ -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"