diff options
| author | Russell Bryant <russell@russellbryant.com> | 2009-03-19 18:00:15 +0000 |
|---|---|---|
| committer | Russell Bryant <russell@russellbryant.com> | 2009-03-19 18:00:15 +0000 |
| commit | 4210f17abbedd6ea383054b1832d3b03ac0b98d1 (patch) | |
| tree | 0f909c3ed67a52223d512876aab6ee7aa764c5a5 /main/loader.c | |
| parent | 76b79666067b8326a8949f7dba8612a3fde00b33 (diff) | |
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: https://origsvn.digium.com/svn/asterisk/trunk@183242 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/loader.c')
| -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 05524fe08..5f2fe8678 100644 --- a/main/loader.c +++ b/main/loader.c @@ -403,18 +403,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; @@ -435,7 +423,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; |