Merged revisions 120602 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r120602 | tilghman | 2008-06-05 10:58:11 -0500 (Thu, 05 Jun 2008) | 4 lines

Conditionally load the AGI command gosub, depending on whether or not res_agi
has been loaded, fix a return value in the loader, and ensure that the help
workhorse header does not print on load.

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@120603 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-06-05 16:01:32 +00:00
parent c6dc1218fc
commit ca20011d2c
3 changed files with 30 additions and 13 deletions

View File

@@ -722,11 +722,12 @@ static enum ast_module_load_result load_resource(const char *resource_name, unsi
int ast_load_resource(const char *resource_name)
{
int res;
AST_LIST_LOCK(&module_list);
load_resource(resource_name, 0);
res = load_resource(resource_name, 0);
AST_LIST_UNLOCK(&module_list);
return 0;
return res;
}
struct load_order_entry {