diff options
author | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 19:45:25 +0000 |
---|---|---|
committer | tilghman <tilghman@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-07-11 19:45:25 +0000 |
commit | 9abaf81eec251d856fe369adfebd7fd786b5f3be (patch) | |
tree | fa8b4c02251c6b22237e01ba126865a593320817 | |
parent | d145af84a3fe48da9dfc9cb58cbb5e5d7e27c910 (diff) |
Merged revisions 130230 via svnmerge from
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@130231 f38db490-d61c-443f-a65b-d21fe96a405b
-rw-r--r-- | channels/chan_agent.c | 2 | ||||
-rw-r--r-- | channels/chan_dahdi.c | 2 | ||||
-rw-r--r-- | utils/astman.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/channels/chan_agent.c b/channels/chan_agent.c index 36595a7b1..9d6e14a16 100644 --- a/channels/chan_agent.c +++ b/channels/chan_agent.c @@ -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 */ diff --git a/channels/chan_dahdi.c b/channels/chan_dahdi.c index d8d57537f..1f4d27042 100644 --- a/channels/chan_dahdi.c +++ b/channels/chan_dahdi.c @@ -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)); diff --git a/utils/astman.c b/utils/astman.c index 6c8d74291..3cfc27d81 100644 --- a/utils/astman.c +++ b/utils/astman.c @@ -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 |