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

INTEGRATION: CWS sixtyfour02 (1.5.16); FILE MERGED

Browse Source 
2006/02/21 12:04:20 cmc 1.5.16.1: #i62314# search lib64 on x86_64
This commit is contained in:
Vladimir Glazounov
2006-03-16 12:13:00 +00:00
parent eddd2c916c
commit 889f5aeaa1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx
View File

@@ -4,9 +4,9 @@
* *
* $RCSfile: gnujre.cxx,v $ * $RCSfile: gnujre.cxx,v $
* *
* $Revision: 1.6 $ * $Revision: 1.7 $
* *
* last change: $Author: kz $ $Date: 2006-02-28 10:30:59 $ * last change: $Author: vg $ $Date: 2006-03-16 13:13:00 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@@ -63,11 +63,12 @@ char const* const* GnuInfo::getJavaExePaths(int * size)
char const* const* GnuInfo::getRuntimePaths(int * size) char const* const* GnuInfo::getRuntimePaths(int * size)
{ {
static char const* ar[]= { static char const* ar[]= {
#ifdef X86_64
"/lib64/libgcj.so.7",
"/lib64/libgcj.so.6"
#else
"/lib/libgcj.so.7", "/lib/libgcj.so.7",
"/lib/libgcj.so.6" "/lib/libgcj.so.6"
#if 0 //unreliable
, "/lib/libgcj.so.5"
, "/lib/libgcj.so.4"
#endif #endif
}; };
*size = sizeof(ar) / sizeof (char*); *size = sizeof(ar) / sizeof (char*);