From 6a0ae0aca48b1860fb3bae887fedcf9d4461baf8 Mon Sep 17 00:00:00 2001
From: "Kevin P. Fleming" <kpfleming@digium.com>
Date: Mon, 22 Oct 2007 14:56:05 +0000
Subject: [PATCH] merging patches that don't compile is bad... mmkay?
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86695 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
main/loader.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/main/loader.c b/main/loader.c
index f2fa053170..07bf7466c3 100644
--- a/main/loader.c
+++ b/main/loader.c
@@ -52,7 +52,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#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 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/md5.h"
#include "asterisk/utils.h"
-#ifdefndef RTLD_NOW
+#ifndef RTLD_NOW
#define RTLD_NOW 0
#endif
@@ -391,7 +391,7 @@ 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
*/
-#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));
--
GitLab