[svn-commits] file: trunk r86631 - in /trunk: ./ main/acl.c main/loader.c

[SVN commits to the Digium repositories]

Author: file
Date: Mon Oct 22 08:36:13 2007
New Revision: 86631

URL: http://svn.digium.com/view/asterisk?view=rev&rev=86631
Log:
Merged revisions 86630 via svnmerge from 
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)

........

Modified:
    trunk/   (props changed)
    trunk/main/acl.c
    trunk/main/loader.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/acl.c
URL: http://svn.digium.com/view/asterisk/trunk/main/acl.c?view=diff&rev=86631&r1=86630&r2=86631
==============================================================================
--- trunk/main/acl.c (original)
+++ trunk/main/acl.c Mon Oct 22 08:36:13 2007
@@ -127,7 +127,7 @@
 	struct ast_ha *prev = NULL;
 	struct ast_ha *ret;
 	int x;
-	char *tmp = strdupa(stuff);
+	char *tmp = ast_strdupa(stuff);
 
 	ret = path;
 	while (path) {

Modified: trunk/main/loader.c
URL: http://svn.digium.com/view/asterisk/trunk/main/loader.c?view=diff&rev=86631&r1=86630&r2=86631
==============================================================================
--- trunk/main/loader.c (original)
+++ trunk/main/loader.c Mon Oct 22 08:36:13 2007
@@ -52,7 +52,7 @@
 #include "asterisk/http.h"
 #include "asterisk/lock.h"
 
-#ifdef DLFCNCOMPAT
+#ifdefdef DLFCNCOMPAT
 #include "asterisk/dlfcn-compat.h"
 #else
 #include <dlfcn.h>
@@ -61,7 +61,7 @@
 #include "asterisk/md5.h"
 #include "asterisk/utils.h"
 
-#ifndef RTLD_NOW
+#ifdefndef RTLD_NOW
 #define RTLD_NOW 0
 #endif
 
@@ -318,7 +318,7 @@
 	return cur;
 }
 
-#if LOADABLE_MODULES
+#ifdef LOADABLE_MODULES
 static void unload_dynamic_module(struct ast_module *mod)
 {
 	void *lib = mod->lib;
@@ -391,7 +391,7 @@
 	   on the already-opened library to what we want... if not, we have to
 	   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))) {
 		ast_log(LOG_WARNING, "Unable to promote flags on module '%s': %s\n", resource_in, dlerror());
 		while (!dlclose(lib));
@@ -500,7 +500,7 @@
 	if (!error && !mod->lib)
 		mod->info->restore_globals();
 
-#if LOADABLE_MODULES
+#ifdef LOADABLE_MODULES
 	if (!error)
 		unload_dynamic_module(mod);
 #endif
@@ -627,7 +627,7 @@
 		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) {
@@ -645,7 +645,7 @@
 
 	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;
@@ -732,7 +732,7 @@
 	struct load_order load_order;
 	int res = 0;
 	struct ast_flags config_flags = { 0 };
-#if LOADABLE_MODULES
+#ifdef LOADABLE_MODULES
 	struct dirent *dirent;
 	DIR *dir;
 #endif
@@ -771,7 +771,7 @@
 			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))) {