diff options
author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-19 18:14:55 +0000 |
---|---|---|
committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-03-19 18:14:55 +0000 |
commit | 6bf785300e123817bdd8978a39d25351306ad6b5 (patch) | |
tree | 6ad878a568407f84ef12d0a262b680e4641c63d7 /main | |
parent | f58f004995d2397f9da663bf052a964a56ac4f21 (diff) |
Merged revisions 183242 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r183242 | russell | 2009-03-19 13:00:15 -0500 (Thu, 19 Mar 2009) | 10 lines
Merged revisions 183241 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r183241 | russell | 2009-03-19 12:52:52 -0500 (Thu, 19 Mar 2009) | 2 lines
Remove the use of RTLD_NOLOAD, as it is not behaving like expected.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@183249 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main')
-rw-r--r-- | main/loader.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/main/loader.c b/main/loader.c index 735459f04..19bc9cee3 100644 --- a/main/loader.c +++ b/main/loader.c @@ -402,18 +402,6 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned return NULL; } - /* if the system supports RTLD_NOLOAD, we can just 'promote' the flags - on the already-opened library to what we want... if not, we have to - close it and start over - */ -#if defined(HAVE_RTLD_NOLOAD) && !defined(__Darwin__) - if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) { - ast_log(LOG_WARNING, "Unable to promote flags on module '%s': %s\n", resource_in, dlerror()); - while (!dlclose(lib)); - ast_free(resource_being_loaded); - return NULL; - } -#else while (!dlclose(lib)); resource_being_loaded = NULL; @@ -434,7 +422,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; |