[asterisk-commits] tilghman: branch 1.6.0 r130231 - in /branches/1.6.0: ./ channels/ utils/

[SVN commits to the Asterisk project]

Author: tilghman
Date: Fri Jul 11 14:45:25 2008
New Revision: 130231

URL: http://svn.digium.com/view/asterisk?view=rev&rev=130231
Log:
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

........

Modified:
    branches/1.6.0/   (props changed)
    branches/1.6.0/channels/chan_agent.c
    branches/1.6.0/channels/chan_dahdi.c
    branches/1.6.0/utils/astman.c

Propchange: branches/1.6.0/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.0/channels/chan_agent.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_agent.c?view=diff&rev=130231&r1=130230&r2=130231
==============================================================================
--- branches/1.6.0/channels/chan_agent.c (original)
+++ branches/1.6.0/channels/chan_agent.c Fri Jul 11 14:45:25 2008
@@ -2483,7 +2483,7 @@
 	/* 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 */

Modified: branches/1.6.0/channels/chan_dahdi.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/channels/chan_dahdi.c?view=diff&rev=130231&r1=130230&r2=130231
==============================================================================
--- branches/1.6.0/channels/chan_dahdi.c (original)
+++ branches/1.6.0/channels/chan_dahdi.c Fri Jul 11 14:45:25 2008
@@ -13512,7 +13512,7 @@
 	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));

Modified: branches/1.6.0/utils/astman.c
URL: http://svn.digium.com/view/asterisk/branches/1.6.0/utils/astman.c?view=diff&rev=130231&r1=130230&r2=130231
==============================================================================
--- branches/1.6.0/utils/astman.c (original)
+++ branches/1.6.0/utils/astman.c Fri Jul 11 14:45:25 2008
@@ -41,6 +41,7 @@
 #include "asterisk/md5.h"
 #include "asterisk/linkedlists.h"
 
+#define ARRAY_LEN(a) (sizeof(a) / sizeof(a[0]))
 
 #undef gethostbyname