[asterisk-commits] file: branch 1.4 r45817 - /branches/1.4/main/loader.c

[asterisk-commits at lists.digium.com]

Author: file
Date: Sat Oct 21 13:48:58 2006
New Revision: 45817

URL: http://svn.digium.com/view/asterisk?rev=45817&view=rev
Log:
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.

Modified:
    branches/1.4/main/loader.c

Modified: branches/1.4/main/loader.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/main/loader.c?rev=45817&r1=45816&r2=45817&view=diff
==============================================================================
--- branches/1.4/main/loader.c (original)
+++ branches/1.4/main/loader.c Sat Oct 21 13:48:58 2006
@@ -393,9 +393,9 @@
 	   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;