kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-09-05 12:16:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 86630 via svnmerge from

Browse Source 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r86630 | file | 2007-10-22 10:33:23 -0300 (Mon, 22 Oct 2007) | 6 lines

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/trunk@86631 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Joshua Colp
2007-10-22 13:36:13 +00:00
parent a71dba9627
commit e4b75ab0e0
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
main/acl.c
View File

@@ -127,7 +127,7 @@ struct ast_ha *ast_append_ha(char *sense, char *stuff, struct ast_ha *path, int
struct ast_ha *prev = NULL; struct ast_ha *prev = NULL;
struct ast_ha *ret; struct ast_ha *ret;
int x; int x;
char *tmp = strdupa(stuff); char *tmp = ast_strdupa(stuff);
ret = path; ret = path;
while (path) { while (path) {

18
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"
#ifdef DLFCNCOMPAT #ifdefdef 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"
#ifndef RTLD_NOW #ifdefndef RTLD_NOW
#define RTLD_NOW 0 #define RTLD_NOW 0
#endif #endif
@@ -318,7 +318,7 @@ static struct ast_module *find_resource(const char *resource, int do_lock)
return cur; return cur;
} }
#if LOADABLE_MODULES #ifdef LOADABLE_MODULES
static void unload_dynamic_module(struct ast_module *mod) static void unload_dynamic_module(struct ast_module *mod)
{ {
void *lib = mod->lib; void *lib = mod->lib;
@@ -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
*/ */
#if defined(HAVE_RTLD_NOLOAD) && !defined(__Darwin__) #ifdef 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));
@@ -500,7 +500,7 @@ int ast_unload_resource(const char *resource_name, enum ast_module_unload_mode f
if (!error && !mod->lib) if (!error && !mod->lib)
mod->info->restore_globals(); mod->info->restore_globals();
#if LOADABLE_MODULES #ifdef LOADABLE_MODULES
if (!error) if (!error)
unload_dynamic_module(mod); unload_dynamic_module(mod);
#endif #endif
@@ -627,7 +627,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)) if (global_symbols_only && !ast_test_flag(mod->info, AST_MODFLAG_GLOBAL_SYMBOLS))
return AST_MODULE_LOAD_SKIP; return AST_MODULE_LOAD_SKIP;
} else { } else {
#if LOADABLE_MODULES #ifdef LOADABLE_MODULES
if (!(mod = load_dynamic_module(resource_name, global_symbols_only))) { if (!(mod = load_dynamic_module(resource_name, global_symbols_only))) {
/* don't generate a warning message during load_modules() */ /* don't generate a warning message during load_modules() */
if (!global_symbols_only) { if (!global_symbols_only) {
@@ -645,7 +645,7 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi
if (inspect_module(mod)) { if (inspect_module(mod)) {
ast_log(LOG_WARNING, "Module '%s' could not be loaded.\n", resource_name); ast_log(LOG_WARNING, "Module '%s' could not be loaded.\n", resource_name);
#if LOADABLE_MODULES #ifdef LOADABLE_MODULES
unload_dynamic_module(mod); unload_dynamic_module(mod);
#endif #endif
return AST_MODULE_LOAD_DECLINE; return AST_MODULE_LOAD_DECLINE;
@@ -732,7 +732,7 @@ int load_modules(unsigned int preload_only)
struct load_order load_order; struct load_order load_order;
int res = 0; int res = 0;
struct ast_flags config_flags = { 0 }; struct ast_flags config_flags = { 0 };
#if LOADABLE_MODULES #ifdef LOADABLE_MODULES
struct dirent *dirent; struct dirent *dirent;
DIR *dir; DIR *dir;
#endif #endif
@@ -771,7 +771,7 @@ int load_modules(unsigned int preload_only)
order = add_to_load_order(mod->resource, &load_order); 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 /* if we are allowed to load dynamic modules, scan the directory for
for all available modules and add them as well */ for all available modules and add them as well */
if ((dir = opendir(ast_config_AST_MODULE_DIR))) { if ((dir = opendir(ast_config_AST_MODULE_DIR))) {