aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-21 18:48:58 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-10-21 18:48:58 +0000
commit79b72a38883d2182f031692a68c38898effd1e71 (patch)
tree1c6bac9e33ad16b325b170aa3075d41f2c7df1ad
parentce51e3f0412f15608a9f18de6ce4f95092d4a56c (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@45817 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r--main/loader.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/main/loader.c b/main/loader.c
index e31dfaa88..5f74f042d 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -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;