diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 15:19:33 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2006-08-11 15:19:33 +0000 |
| commit | a35ecbd6ad9295eb41286e715717b445e9f94289 (patch) | |
| tree | 14a510c33542eee458c534e3cf37d8dbea1f701b /jvmfwk | |
| parent | a878c4f639151b91b5c520f0dbbda324934cb935 (diff) | |
INTEGRATION: CWS gcjsix (1.11.12); FILE MERGED
2006/08/02 09:35:23 cmc 1.11.12.1: #i64918# treat gcj like the rest of the sunalike javas
Diffstat (limited to 'jvmfwk')
| -rwxr-xr-x | jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx index def0337bc675..d2fb1467db1e 100755 --- a/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx +++ b/jvmfwk/plugins/sunmajor/javaenvsetup/javaldx.cxx @@ -4,9 +4,9 @@ * * $RCSfile: javaldx.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: hr $ $Date: 2006-06-20 00:08:19 $ + * last change: $Author: hr $ $Date: 2006-08-11 16:19:33 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -128,11 +128,13 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) rtl::OUString sVendor3(RTL_CONSTASCII_USTRINGPARAM("Blackdown Java-Linux Team")); rtl::OUString sVendor4(RTL_CONSTASCII_USTRINGPARAM("Apple Computer, Inc.")); rtl::OUString sVendor5(RTL_CONSTASCII_USTRINGPARAM("BEA Systems, Inc.")); + rtl::OUString sVendor6(RTL_CONSTASCII_USTRINGPARAM("Free Software Foundation, Inc.")); if ( ! (sVendor1.equals(pInfo->sVendor) == sal_True || sVendor2.equals(pInfo->sVendor) == sal_True || sVendor3.equals(pInfo->sVendor) == sal_True || sVendor4.equals(pInfo->sVendor) == sal_True - || sVendor5.equals(pInfo->sVendor) == sal_True)) + || sVendor5.equals(pInfo->sVendor) == sal_True + || sVendor6.equals(pInfo->sVendor) == sal_True)) return 0; rtl::OString sPaths = getLD_LIBRARY_PATH(pInfo->arVendorData); |