diff options
| author | Tor Lillqvist <tml@iki.fi> | 2012-09-14 14:07:29 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tlillqvist@suse.com> | 2012-09-14 14:15:48 +0300 |
| commit | 225016198320a7e1d9a966de8e4ee357565e5b73 (patch) | |
| tree | 9d8bc0e9e27ed492be156f7118749a2ccaa841a0 /sal | |
| parent | 0fb18d82742f704017768d342180e0bb2943c3aa (diff) | |
Adapt for DISABLE_DYNLOADING possibility on Android
Change-Id: I7fcea698c3d89c5b84b38a708502bcdf4526a614
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/module.cxx | 4 | ||||
| -rw-r--r-- | sal/osl/unx/process_impl.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx index a68a105e7fb7..386aa0b1c2a9 100644 --- a/sal/osl/unx/module.cxx +++ b/sal/osl/unx/module.cxx @@ -96,7 +96,7 @@ static sal_Bool getModulePathFromAddress(void * address, rtl_String ** path) { #else Dl_info dl_info; -#ifdef ANDROID +#if defined(ANDROID) && !defined(DISABLE_DYNLOADING) result = lo_dladdr(address, &dl_info); #else result = dladdr(address, &dl_info); @@ -105,7 +105,7 @@ static sal_Bool getModulePathFromAddress(void * address, rtl_String ** path) { if (result != 0) { rtl_string_newFromStr(path, dl_info.dli_fname); -#ifdef ANDROID +#if defined(ANDROID) && !defined(DISABLE_DYNLOADING) free((void *) dl_info.dli_fname); #endif result = sal_True; diff --git a/sal/osl/unx/process_impl.cxx b/sal/osl/unx/process_impl.cxx index 817b0f6ab748..5225a63b8662 100644 --- a/sal/osl/unx/process_impl.cxx +++ b/sal/osl/unx/process_impl.cxx @@ -113,7 +113,7 @@ oslProcessError SAL_CALL osl_bootstrap_getExecutableFile_Impl ( { oslProcessError result = osl_Process_E_NotFound; -#ifdef ANDROID +#if defined(ANDROID) && !defined(DISABLE_DYNLOADING) /* On Android we in theory want the address of the "lo_main()" * function, as that is what corresponds to "main()" in * LibreOffice programs on normal desktop OSes. |