sal/osl/unx/module.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
New commits: commit 9895690965e79cc57502001f95a2cb09971fe7d5 Author: Tor Lillqvist <tlillqv...@suse.com> Date: Mon Mar 12 15:57:31 2012 +0200 Fix Android compilation error diff --git a/sal/osl/unx/module.cxx b/sal/osl/unx/module.cxx index e5e91e6..419bfc5 100644 --- a/sal/osl/unx/module.cxx +++ b/sal/osl/unx/module.cxx @@ -160,19 +160,19 @@ oslModule SAL_CALL osl_loadModuleAscii(const sal_Char *pModuleName, sal_Int32 nR { #ifndef NO_DL_FUNCTIONS #ifdef ANDROID - void *pLib = lo_dlopen(pModuleName); (void) nRtldMode; + void *pLib = lo_dlopen(pModuleName); #else int rtld_mode = ((nRtldMode & SAL_LOADMODULE_NOW) ? RTLD_NOW : RTLD_LAZY) | ((nRtldMode & SAL_LOADMODULE_GLOBAL) ? RTLD_GLOBAL : RTLD_LOCAL); void* pLib = dlopen(pModuleName, rtld_mode); -#endif + SAL_INFO_IF( pLib == 0, "sal.osl", "dlopen(" << pModuleName << ", " << rtld_mode << "): " << dlerror()); - +#endif return ((oslModule)(pLib)); #else /* NO_DL_FUNCTIONS */ _______________________________________________ Libreoffice-commits mailing list Libreoffice-commits@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits