diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:52:11 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-01-31 08:52:11 +0000 |
| commit | 5f088ccb3c3bc764a01fc3024463e1a18ec98476 (patch) | |
| tree | b75097840e2b52a567877f69a1b979f32cefb953 | |
| parent | 3cb8499e849960e65ab712e92d49c27699a0f727 (diff) | |
INTEGRATION: CWS jre5issues (1.20.8); FILE MERGED
2005/01/14 10:10:31 jl 1.20.8.1: #i39912# fixes for MAC
| -rw-r--r-- | jvmfwk/source/fwkutil.cxx | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/jvmfwk/source/fwkutil.cxx b/jvmfwk/source/fwkutil.cxx index e97bb8c7f..ac34e00e1 100644 --- a/jvmfwk/source/fwkutil.cxx +++ b/jvmfwk/source/fwkutil.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fwkutil.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: hr $ $Date: 2004-11-09 14:01:02 $ + * last change: $Author: rt $ $Date: 2005-01-31 09:52:11 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -279,7 +279,11 @@ rtl::OUString findPlugin(const rtl::OUString & plugin) { rtl::OUString url; #ifdef UNX +#ifdef MACOSX + rtl::OUString path = rtl::OUString::createFromAscii("DYLD_LIBRARY_PATH"); +#else rtl::OUString path = rtl::OUString::createFromAscii("LD_LIBRARY_PATH"); +#endif rtl::OUString env_path; oslProcessError err = osl_getEnvironment(path.pData, &env_path.pData); if (err != osl_Process_E_None && err != osl_Process_E_NotFound) |