Fixes for building under OpenSolaris.

(closes issue #11047)
Reported by: snuffy
Patches:
      11047-fixes.diff uploaded by snuffy (license 35)


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@86630 65c4cc65-6c06-0410-ace0-fbb531ad65f3
1.4
Joshua Colp 18 years ago
parent e4df4c58ec
commit fb53e2a7f5

@ -318,7 +318,7 @@ static struct ast_module *find_resource(const char *resource, int do_lock)
return cur;
}
#if LOADABLE_MODULES
#ifdef LOADABLE_MODULES
static void unload_dynamic_module(struct ast_module *mod)
{
void *lib = mod->lib;
@ -502,7 +502,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f
AST_LIST_UNLOCK(&module_list);
#if LOADABLE_MODULES
#ifdef LOADABLE_MODULES
if (!error)
unload_dynamic_module(mod);
#endif
@ -630,7 +630,7 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi
if (global_symbols_only && !ast_test_flag(mod->info, AST_MODFLAG_GLOBAL_SYMBOLS))
return AST_MODULE_LOAD_SKIP;
} else {
#if LOADABLE_MODULES
#ifdef LOADABLE_MODULES
if (!(mod = load_dynamic_module(resource_name, global_symbols_only))) {
/* don't generate a warning message during load_modules() */
if (!global_symbols_only) {
@ -648,7 +648,7 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi
if (inspect_module(mod)) {
ast_log(LOG_WARNING, "Module '%s' could not be loaded.\n", resource_name);
#if LOADABLE_MODULES
#ifdef LOADABLE_MODULES
unload_dynamic_module(mod);
#endif
return AST_MODULE_LOAD_DECLINE;
@ -731,7 +731,7 @@ int load_modules(unsigned int preload_only)
unsigned int load_count;
struct load_order load_order;
int res = 0;
#if LOADABLE_MODULES
#ifdef LOADABLE_MODULES
struct dirent *dirent;
DIR *dir;
#endif
@ -771,7 +771,7 @@ int load_modules(unsigned int preload_only)
order = add_to_load_order(mod->resource, &load_order);
}
#if LOADABLE_MODULES
#ifdef LOADABLE_MODULES
/* if we are allowed to load dynamic modules, scan the directory for
for all available modules and add them as well */
if ((dir = opendir(ast_config_AST_MODULE_DIR))) {

Loading…
Cancel
Save