kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-10-27 14:41:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

merging patches that don't compile is bad... mmkay?

Browse Source 
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@86695 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Kevin P. Fleming
2007-10-22 14:56:05 +00:00
parent 150964ab0e
commit 6a0ae0aca4
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
main/loader.c
View File

@@ -52,7 +52,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/http.h" #include "asterisk/http.h"
#include "asterisk/lock.h" #include "asterisk/lock.h"
#ifdefdef DLFCNCOMPAT #ifdef DLFCNCOMPAT
#include "asterisk/dlfcn-compat.h" #include "asterisk/dlfcn-compat.h"
#else #else
#include <dlfcn.h> #include <dlfcn.h>
@@ -61,7 +61,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/md5.h" #include "asterisk/md5.h"
#include "asterisk/utils.h" #include "asterisk/utils.h"
#ifdefndef RTLD_NOW #ifndef RTLD_NOW
#define RTLD_NOW 0 #define RTLD_NOW 0
#endif #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 on the already-opened library to what we want... if not, we have to
close it and start over 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))) { 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()); ast_log(LOG_WARNING, "Unable to promote flags on module '%s': %s\n", resource_in, dlerror());
while (!dlclose(lib)); while (!dlclose(lib));