summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2018-06-24 00:36:03 +0300
committerAndrei Karas <akaras@inbox.ru>2018-06-24 00:36:03 +0300
commit4fcb30775510869726977752ac19ed0b875a8e04 (patch)
tree217d7cf370e245cbae0082d7e29eb1ab0ae1f954
parent49eca549d6dea965abaf8223f81e64d1d5d824a7 (diff)
downloadhercules-4fcb30775510869726977752ac19ed0b875a8e04.tar.gz
hercules-4fcb30775510869726977752ac19ed0b875a8e04.tar.bz2
hercules-4fcb30775510869726977752ac19ed0b875a8e04.tar.xz
hercules-4fcb30775510869726977752ac19ed0b875a8e04.zip
Revert "Remove flag RTLD_DEEPBIND from dlopen."s20180713
This reverts commit 49eca549d6dea965abaf8223f81e64d1d5d824a7.
-rw-r--r--src/common/HPM.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/common/HPM.h b/src/common/HPM.h
index efa5d8370..e55397022 100644
--- a/src/common/HPM.h
+++ b/src/common/HPM.h
@@ -42,7 +42,11 @@
#define DLL HINSTANCE
#else // ! WIN32
#include <dlfcn.h>
- #define plugin_open(x) dlopen((x), RTLD_NOW)
+ #ifdef RTLD_DEEPBIND // Certain linux distributions require this, but it's not available everywhere
+ #define plugin_open(x) dlopen((x),RTLD_NOW|RTLD_DEEPBIND)
+ #else // ! RTLD_DEEPBIND
+ #define plugin_open(x) dlopen((x),RTLD_NOW)
+ #endif // RTLD_DEEPBIND
#define plugin_import(x,y,z) (z)dlsym((x),(y))
#define plugin_close(x) dlclose(x)
#define plugin_geterror(buf) ((void)buf, dlerror())