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 /src/lj_clib.c | |
parent | a7d0265480c662964988f83d4e245bf139eb7cc0 (diff) | |
parent | a93f4bb39ff99399994b19249e0833da64bc2eb0 (diff) | |
download | luajit-e61a1f961ac3f063a5d80ca9b7b7e263810abf74.tar.gz luajit-e61a1f961ac3f063a5d80ca9b7b7e263810abf74.tar.bz2 luajit-e61a1f961ac3f063a5d80ca9b7b7e263810abf74.zip |
Merge branch 'master' into v2.1
Diffstat (limited to 'src/lj_clib.c')
-rw-r--r-- | src/lj_clib.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) |