diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-08 15:16:10 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-04-08 15:16:10 +0000 |
commit | 5450c3b6b7cdd4bd9dcd470d282aa5a30d723cd0 (patch) | |
tree | b86d4fee4b095c77ce6362fec19b33e6d3567d8c /jvmfwk | |
parent | 05599483059b3702cbf7f257ced17281c780c54f (diff) |
INTEGRATION: CWS cmcfixes3 (1.2.12); FILE MERGED
2005/03/16 09:11:00 cmc 1.2.12.1: #i45100# disable support for libgcj.5
Diffstat (limited to 'jvmfwk')
-rw-r--r-- | jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx index 9aeda743eca8..15722e48a307 100644 --- a/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx +++ b/jvmfwk/plugins/sunmajor/pluginlib/gnujre.cxx @@ -2,9 +2,9 @@ * * $RCSfile: gnujre.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: obo $ $Date: 2005-01-25 15:18:46 $ + * last change: $Author: hr $ $Date: 2005-04-08 16:16:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -89,10 +89,11 @@ char const* const* GnuInfo::getJavaExePaths(int * size) char const* const* GnuInfo::getRuntimePaths(int * size) { static char const* ar[]= { - "/lib/libgcj.so", - "/lib/libgcj.so.6", - "/lib/libgcj.so.5", - "/lib/libgcj.so.4", + "/lib/libgcj.so.6" +#if 0 //unreliable + , "/lib/libgcj.so.5" + , "/lib/libgcj.so.4" +#endif }; *size = sizeof(ar) / sizeof (char*); return ar; |