Prevent use of RTLD_DEFAULT when NO_RTLD_DEFAULT is defined.

Workaround for Android 4.4 bug.
Thanks to gudzpoz.

diff --git a/src/lib_package.c b/src/lib_package.c
index a9c1ca487d70f8914cca421e2036a80393156f5a..d2ef474fd4260dea316af5ecab97269c58ba50e6 100644 (file)
--- a/src/lib_package.c
+++ b/src/lib_package.c
@@ -57,7 +57,7 @@ static lua_CFunction ll_sym(lua_State *L, void *lib, const char *sym)
 
 static const char *ll_bcsym(void *lib, const char *sym)
 {
-#if defined(RTLD_DEFAULT)
+#if defined(RTLD_DEFAULT) && !defined(NO_RTLD_DEFAULT)
   if (lib == NULL) lib = RTLD_DEFAULT;
 #elif LJ_TARGET_OSX || LJ_TARGET_BSD
   if (lib == NULL) lib = (void *)(intptr_t)-2;

diff --git a/src/lj_clib.c b/src/lj_clib.c
index e0f274bb25cbde772ff51a6912980c20bb2c3f1f..ab2db33ad76a07fc37857cadf9b207a3596b80be 100644 (file)
--- a/src/lj_clib.c
+++ b/src/lj_clib.c
@@ -24,7 +24,7 @@
 #include <dlfcn.h>
 #include <stdio.h>
 
-#if defined(RTLD_DEFAULT)
+#if defined(RTLD_DEFAULT) && !defined(NO_RTLD_DEFAULT)
 #define CLIB_DEFHANDLE RTLD_DEFAULT
 #elif LJ_TARGET_OSX || LJ_TARGET_BSD
 #define CLIB_DEFHANDLE ((void *)(intptr_t)-2)