From 62d3a11eb923c79c3cd2d5b7e39168d3b1d51a7e Mon Sep 17 00:00:00 2001
From: Joshua Colp <jcolp@digium.com>
Date: Sat, 21 Oct 2006 18:52:33 +0000
Subject: [PATCH] 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
---
main/loader.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/main/loader.c b/main/loader.c
index dd33f9b1e1..192cbd8942 100644
--- 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;
--
GitLab