summaryrefslogtreecommitdiff
path: root/sal
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2021-02-16 11:02:45 +0100
committerStephan Bergmann <sbergman@redhat.com>2021-02-16 16:46:57 +0100
commit0b86394983e05f7ffecb9e20792aba090680eff6 (patch)
tree2adffcde2ade3ecdc09616c2324cb3d89f46806b /sal
parentc4957b237eeb3e7895a102f9a01d7cf087cc5373 (diff)
Remove dead "defined(ANDROID) && !defined(DISABLE_DYNLOADING)" code
4b7e701024219be48b7f8154a508c79cb0a6fdc1 "Use DISABLE_DYNLOADING on Android" has removed lo_dladdr, so this conditional code is apparently dead, and its clean-up was presumably forgotten in that commit. Change-Id: Icf8e4056366f90837c48dd2fcf45936f8015eb43 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/110981 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sal')
-rw-r--r--sal/osl/unx/module.cxx7
1 files changed, 0 insertions, 7 deletions
diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx
index 7befa66678f6..7669c047a7a3 100644
--- a/sal/osl/unx/module.cxx
+++ b/sal/osl/unx/module.cxx
@@ -89,18 +89,11 @@ static bool getModulePathFromAddress(void * address, rtl_String ** path) {
#else
Dl_info dl_info;
-#if defined(ANDROID) && !defined(DISABLE_DYNLOADING)
- result = lo_dladdr(address, &dl_info) != 0;
-#else
result = dladdr(address, &dl_info) != 0;
-#endif
if (result)
{
rtl_string_newFromStr(path, dl_info.dli_fname);
-#if defined(ANDROID) && !defined(DISABLE_DYNLOADING)
- free((void *) dl_info.dli_fname);
-#endif
}
#endif
return result;