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 | 962f0d024edaebab88a98fa87b85a454c0440665 (patch) | |
| tree | d9008889b4a02ed387c8ce28ea3ca3be9afb0d1a /jvmfwk | |
| parent | 5fcdbca02e601d9d8e7ee131e2e385c37d91099a (diff) | |
INTEGRATION: CWS jre5issues (1.20.8); FILE MERGED
2005/01/14 10:10:31 jl 1.20.8.1: #i39912# fixes for MAC
Diffstat (limited to 'jvmfwk')
| -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 9572dcfd7b1d..302d3e9f8505 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) |