Merged revisions 45817 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r45817 | file | 2006-10-21 14:48:58 -0400 (Sat, 21 Oct 2006) | 2 lines

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/trunk@45820 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/main/loader.c b/main/loader.c
index dd33f9b1e171fb0ee31d598dad902441cfb5e8d0..192cbd8942648f89253690db8824d20cece41cd0 100644 (file)
--- a/main/loader.c
+++ b/main/loader.c
@@ -394,9 +394,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
           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))) {
-               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));
                free(resource_being_loaded);
                return NULL;