mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-25 15:08:53 +00:00
Don't use promotion on Darwin because it doesn't seem to work quite right in all cases, this should solve the unresolved symbol issue people have been seeing.
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@45817 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
@@ -393,9 +393,9 @@ 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
|
on the already-opened library to what we want... if not, we have to
|
||||||
close it and start over
|
close it and start over
|
||||||
*/
|
*/
|
||||||
#if HAVE_RTLD_NOLOAD
|
#if defined(HAVE_RTLD_NOLOAD) && !defined(__Darwin__)
|
||||||
if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) {
|
if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_LAZY | RTLD_GLOBAL : RTLD_NOW | RTLD_LOCAL))) {
|
||||||
ast_log(LOG_WARNING, "Unable to promot flags on module '%s': %s\n", resource_in, dlerror());
|
ast_log(LOG_WARNING, "Unable to promote flags on module '%s': %s\n", resource_in, dlerror());
|
||||||
while (!dlclose(lib));
|
while (!dlclose(lib));
|
||||||
free(resource_being_loaded);
|
free(resource_being_loaded);
|
||||||
return NULL;
|
return NULL;
|
||||||
|
Reference in New Issue
Block a user