diff options
| author | Kevin P. Fleming <kpfleming@digium.com> | 2007-10-22 14:56:05 +0000 |
|---|---|---|
| committer | Kevin P. Fleming <kpfleming@digium.com> | 2007-10-22 14:56:05 +0000 |
| commit | 6a0ae0aca48b1860fb3bae887fedcf9d4461baf8 (patch) | |
| tree | 00305296f369715b4033936cda937e9b9bdf207c /main/loader.c | |
| parent | 150964ab0ebdea61f091505327d08de8deee0d28 (diff) | |
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
Diffstat (limited to 'main/loader.c')
| -rw-r--r-- | main/loader.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/main/loader.c b/main/loader.c index f2fa05317..07bf7466c 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)); |