diff options
author | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-24 17:24:33 +0000 |
---|---|---|
committer | mattf <mattf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2006-08-24 17:24:33 +0000 |
commit | 9d58eaef923ff1344bbce57d9efe2b033f5575c7 (patch) | |
tree | 381a0dbcce5bf4811b1684c0051985164b275afa /main | |
parent | 7558c6f92e267c3385dd679427fa4aea96aeb3f3 (diff) |
Revert stupid RTLD_NOLOAD change that breaks module loading on some systems.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@40981 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/loader.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/main/loader.c b/main/loader.c index a4cf7a825..681f5ed34 100644 --- a/main/loader.c +++ b/main/loader.c @@ -387,14 +387,6 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned on the already-opened library to what we want... if not, we have to close it and start over */ -#if HAVE_RTLD_NOLOAD - if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_GLOBAL : RTLD_NOW))) { - ast_log(LOG_WARNING, "%s\n", dlerror()); - while (!dlclose(lib)); - free(resource_being_loaded); - return NULL; - } -#else while (!dlclose(lib)); resource_being_loaded = NULL; @@ -414,7 +406,6 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned /* since the module was successfully opened, and it registered itself the previous time we did that, we're going to assume it worked this time too :) */ -#endif AST_LIST_LAST(&module_list)->lib = lib; resource_being_loaded = NULL; |