kenmirrors/asterisk
1
0
Fork 0
mirror of https://github.com/asterisk/asterisk.git synced 2025-11-07 10:28:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged revisions 130230 via svnmerge from

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

........
r130230 | tilghman | 2008-07-11 14:40:55 -0500 (Fri, 11 Jul 2008) | 2 lines

Fix trunk breakage

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.0@130231 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Tilghman Lesher
2008-07-11 19:45:25 +00:00
parent feead8b757
commit 9b5c5f096a
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
channels/chan_agent.c
View File

@@ -2483,7 +2483,7 @@ static int unload_module(void)
/* First, take us out of the channel loop */
ast_channel_unregister(&agent_tech);
/* Delete devicestate subscription */
agent_devicestate_sub = ast_event_unsubscribe(agent_devicestate_sub);
ast_event_unsubscribe(agent_devicestate_sub);
/* Unregister dialplan functions */
ast_custom_function_unregister(&agent_function);
/* Unregister CLI commands */

2
channels/chan_dahdi.c
View File

@@ -13512,7 +13512,7 @@ static void process_echocancel(struct dahdi_chan_conf *confp, const char *data,
unsigned int param_count;
unsigned int x;
if (!(param_count = ast_app_separate_args(parse, ',', params, ARRAY_LEN(params)))
if (!(param_count = ast_app_separate_args(parse, ',', params, ARRAY_LEN(params))))
return;
memset(&confp->chan.echocancel, 0, sizeof(confp->chan.echocancel));

1
utils/astman.c
View File

@@ -41,6 +41,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/md5.h"
#include "asterisk/linkedlists.h"
#define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
#undef gethostbyname