From 16157e26d6a5cfcd9d39ec6b99c9f82fff55dc51 Mon Sep 17 00:00:00 2001 From: Matthew Fredrickson Date: Thu, 24 Aug 2006 17:24:33 +0000 Subject: Revert stupid RTLD_NOLOAD change that breaks module loading on some systems. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@40981 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/loader.c | 9 --------- 1 file changed, 9 deletions(-) (limited to 'main/loader.c') diff --git a/main/loader.c b/main/loader.c index a4cf7a825..681f5ed34 100644 --- a/main/loader.c +++ b/main/loader.c @@ -387,14 +387,6 @@ 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 */ -#if HAVE_RTLD_NOLOAD - if (!dlopen(fn, RTLD_NOLOAD | (wants_global ? RTLD_GLOBAL : RTLD_NOW))) { - ast_log(LOG_WARNING, "%s\n", dlerror()); - while (!dlclose(lib)); - free(resource_being_loaded); - return NULL; - } -#else while (!dlclose(lib)); resource_being_loaded = NULL; @@ -414,7 +406,6 @@ static struct ast_module *load_dynamic_module(const char *resource_in, unsigned /* since the module was successfully opened, and it registered itself the previous time we did that, we're going to assume it worked this time too :) */ -#endif AST_LIST_LAST(&module_list)->lib = lib; resource_being_loaded = NULL; -- cgit v1.2.3