[asterisk-commits] kpfleming: trunk r86695 - /trunk/main/loader.c

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Mon Oct 22 09:56:05 2007
New Revision: 86695

URL: http://svn.digium.com/view/asterisk?view=rev&rev=86695
Log:
merging patches that don't compile is bad... mmkay?


Modified:
    trunk/main/loader.c

Modified: trunk/main/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/main/loader.c?view=diff&rev=86695&r1=86694&r2=86695
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Mon Oct 22 09:56:05 2007
@@ -52,7 +52,7 @@
 #include "asterisk/http.h"
 #include "asterisk/lock.h"
 
-#ifdefdef DLFCNCOMPAT
+#ifdef DLFCNCOMPAT
 #include "asterisk/dlfcn-compat.h"
 #else
 #include <dlfcn.h>
@@ -61,7 +61,7 @@
 #include "asterisk/md5.h"
 #include "asterisk/utils.h"
 
-#ifdefndef RTLD_NOW
+#ifndef RTLD_NOW
 #define RTLD_NOW 0
 #endif
 
@@ -391,7 +391,7 @@
 	   on the already-opened library to what we want... if not, we have to
 	   close it and start over
 	*/
-#ifdef defined(HAVE_RTLD_NOLOAD) && !defined(__Darwin__)
+#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 promote flags on module '%s': %s\n", resource_in, dlerror());
 		while (!dlclose(lib));