diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:48:36 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-10-15 11:48:36 +0000 |
| commit | 1f13c7519d88fc6f80df9cc55724a14c5a5922d4 (patch) | |
| tree | ebbc8370abfcae23c2403398deb1d4bcb98dc743 | |
| parent | f0e1761d936fa9b995e6fefc22e5977bb9df29a7 (diff) | |
INTEGRATION: CWS sb71 (1.33.154); FILE MERGED
2007/08/23 17:53:40 sb 1.33.154.4: RESYNC: (1.35-1.36); FILE MERGED
2007/07/23 11:35:32 sb 1.33.154.3: #i75466# MACOSX special case to dlopen next to executable no longer needed.
2007/07/18 12:14:04 sb 1.33.154.2: RESYNC: (1.33-1.35); FILE MERGED
2007/06/29 07:28:43 sb 1.33.154.1: #i75466# Removed unnecessary hack to retry dlopen in CWD.
| -rw-r--r-- | sal/osl/unx/module.c | 22 |
1 files changed, 2 insertions, 20 deletions
diff --git a/sal/osl/unx/module.c b/sal/osl/unx/module.c index c31cb9618..b5f7d24c2 100644 --- a/sal/osl/unx/module.c +++ b/sal/osl/unx/module.c @@ -4,9 +4,9 @@ * * $RCSfile: module.c,v $ * - * $Revision: 1.36 $ + * $Revision: 1.37 $ * - * last change: $Author: ihi $ $Date: 2007-08-17 11:50:25 $ + * last change: $Author: vg $ $Date: 2007-10-15 12:48:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -94,8 +94,6 @@ extern int UnicodeToText(char *, size_t, const sal_Unicode *, sal_Int32); oslModule SAL_CALL osl_psz_loadModule(const sal_Char *pszModuleName, sal_Int32 nRtldMode); -oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl(rtl_uString ** ppFileURL); - /*****************************************************************************/ /* osl_loadModule */ /*****************************************************************************/ @@ -117,22 +115,6 @@ oslModule SAL_CALL osl_loadModule(rtl_uString *ustrModuleName, sal_Int32 nRtldMo if (UnicodeToText(buffer, PATH_MAX, ustrTmp->buffer, ustrTmp->length)) pModule = osl_psz_loadModule(buffer, nRtldMode); - -#ifdef MACOSX - /* dlopen expects absolute paths on Mac OS X */ - if (!pModule && (0 == strchr(buffer, '/'))) - { - rtl_uString* ustrExecutableFile = NULL; - - if (osl_Process_E_None == osl_bootstrap_getExecutableFile_Impl(&ustrExecutableFile)) - { - sal_Int32 n = rtl_ustr_lastIndexOfChar(ustrExecutableFile->buffer, (sal_Unicode) '/'); - rtl_uString_newReplaceStrAt(&ustrTmp, ustrExecutableFile, n + 1, ustrExecutableFile->length - n - 1, ustrModuleName); - pModule = osl_loadModule(ustrTmp, nRtldMode); - rtl_uString_release(ustrExecutableFile); - } - } -#endif rtl_uString_release(ustrTmp); } |