]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Don't use promotion on Darwin because it doesn't seem to work quite right in all...
authorJoshua Colp <jcolp@digium.com>
Sat, 21 Oct 2006 18:48:58 +0000 (18:48 +0000)
committerJoshua Colp <jcolp@digium.com>
Sat, 21 Oct 2006 18:48:58 +0000 (18:48 +0000)
git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@45817 65c4cc65-6c06-0410-ace0-fbb531ad65f3

main/loader.c

index e31dfaa8809cc9fed223825e0797d9c7d76cd54b..5f74f042d704b5027192b1d3723f4d57a0693f29 100644 (file)
@@ -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
           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;