[Libreoffice-commits] core.git: sal/osl

[Stephan Bergmann (via logerrit)]

 sal/osl/unx/module.cxx |    7 -------
 1 file changed, 7 deletions(-)

New commits:
commit 0b86394983e05f7ffecb9e20792aba090680eff6
Author:     Stephan Bergmann <sbergman at redhat.com>
AuthorDate: Tue Feb 16 11:02:45 2021 +0100
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Tue Feb 16 16:46:57 2021 +0100

    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 at redhat.com>

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;