diff options
| author | Mike Pall <mike> | 2022-08-07 20:02:40 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2022-08-07 20:02:40 +0200 |
| commit | a93f4bb39ff99399994b19249e0833da64bc2eb0 (patch) | |
| tree | fcdac22fdd10c88d501a66ce94316cd6576b36fa | |
| parent | 899093a9e0fa5b16f27016381ef4b15529dadff2 (diff) | |
| download | luajit-a93f4bb39ff99399994b19249e0833da64bc2eb0.tar.gz luajit-a93f4bb39ff99399994b19249e0833da64bc2eb0.tar.bz2 luajit-a93f4bb39ff99399994b19249e0833da64bc2eb0.zip | |
Prevent use of RTLD_DEFAULT when NO_RTLD_DEFAULT is defined.
Workaround for Android 4.4 bug.
Thanks to gudzpoz.
Diffstat (limited to '')
| -rw-r--r-- | src/lib_package.c | 2 | ||||
| -rw-r--r-- | src/lj_clib.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib_package.c b/src/lib_package.c index a9c1ca48..d2ef474f 100644 --- 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) | |||
| 57 | 57 | ||
| 58 | static const char *ll_bcsym(void *lib, const char *sym) | 58 | static const char *ll_bcsym(void *lib, const char *sym) |
| 59 | { | 59 | { |
| 60 | #if defined(RTLD_DEFAULT) | 60 | #if defined(RTLD_DEFAULT) && !defined(NO_RTLD_DEFAULT) |
| 61 | if (lib == NULL) lib = RTLD_DEFAULT; | 61 | if (lib == NULL) lib = RTLD_DEFAULT; |
| 62 | #elif LJ_TARGET_OSX || LJ_TARGET_BSD | 62 | #elif LJ_TARGET_OSX || LJ_TARGET_BSD |
| 63 | if (lib == NULL) lib = (void *)(intptr_t)-2; | 63 | if (lib == NULL) lib = (void *)(intptr_t)-2; |
diff --git a/src/lj_clib.c b/src/lj_clib.c index e0f274bb..ab2db33a 100644 --- a/src/lj_clib.c +++ b/src/lj_clib.c | |||
| @@ -24,7 +24,7 @@ | |||
| 24 | #include <dlfcn.h> | 24 | #include <dlfcn.h> |
| 25 | #include <stdio.h> | 25 | #include <stdio.h> |
| 26 | 26 | ||
| 27 | #if defined(RTLD_DEFAULT) | 27 | #if defined(RTLD_DEFAULT) && !defined(NO_RTLD_DEFAULT) |
| 28 | #define CLIB_DEFHANDLE RTLD_DEFAULT | 28 | #define CLIB_DEFHANDLE RTLD_DEFAULT |
| 29 | #elif LJ_TARGET_OSX || LJ_TARGET_BSD | 29 | #elif LJ_TARGET_OSX || LJ_TARGET_BSD |
| 30 | #define CLIB_DEFHANDLE ((void *)(intptr_t)-2) | 30 | #define CLIB_DEFHANDLE ((void *)(intptr_t)-2) |