diff options
| author | Mike Pall <mike> | 2022-08-07 20:04:52 +0200 |
|---|---|---|
| committer | Mike Pall <mike> | 2022-08-07 20:04:52 +0200 |
| commit | e61a1f961ac3f063a5d80ca9b7b7e263810abf74 (patch) | |
| tree | f3f2f3763a8eb3bd75ceeacf626f1d086c35e090 | |
| parent | a7d0265480c662964988f83d4e245bf139eb7cc0 (diff) | |
| parent | a93f4bb39ff99399994b19249e0833da64bc2eb0 (diff) | |
| download | luajit-e61a1f961ac3f063a5d80ca9b7b7e263810abf74.tar.gz luajit-e61a1f961ac3f063a5d80ca9b7b7e263810abf74.tar.bz2 luajit-e61a1f961ac3f063a5d80ca9b7b7e263810abf74.zip | |
Merge branch 'master' into v2.1
| -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 1f8b0677..63a91211 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 57669a14..f0ef6edd 100644 --- a/src/lj_clib.c +++ b/src/lj_clib.c | |||
| @@ -25,7 +25,7 @@ | |||
| 25 | #include <dlfcn.h> | 25 | #include <dlfcn.h> |
| 26 | #include <stdio.h> | 26 | #include <stdio.h> |
| 27 | 27 | ||
| 28 | #if defined(RTLD_DEFAULT) | 28 | #if defined(RTLD_DEFAULT) && !defined(NO_RTLD_DEFAULT) |
| 29 | #define CLIB_DEFHANDLE RTLD_DEFAULT | 29 | #define CLIB_DEFHANDLE RTLD_DEFAULT |
| 30 | #elif LJ_TARGET_OSX || LJ_TARGET_BSD | 30 | #elif LJ_TARGET_OSX || LJ_TARGET_BSD |
| 31 | #define CLIB_DEFHANDLE ((void *)(intptr_t)-2) | 31 | #define CLIB_DEFHANDLE ((void *)(intptr_t)-2) |