[svn-commits] mmichelson: branch group/CCSS r227648 - in /team/group/CCSS: ./ channels/ inc...

[SVN commits to the Digium repositories]

Author: mmichelson
Date: Wed Nov  4 10:44:42 2009
New Revision: 227648

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=227648
Log:
Sync with trunk so this branch compiles.


Modified:
    team/group/CCSS/   (props changed)
    team/group/CCSS/channels/chan_dahdi.c
    team/group/CCSS/include/asterisk/pbx.h
    team/group/CCSS/main/frame.c

Propchange: team/group/CCSS/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Nov  4 10:44:42 2009
@@ -1,1 +1,1 @@
-/trunk:1-227619
+/trunk:1-227647

Modified: team/group/CCSS/channels/chan_dahdi.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/channels/chan_dahdi.c?view=diff&rev=227648&r1=227647&r2=227648
==============================================================================
--- team/group/CCSS/channels/chan_dahdi.c (original)
+++ team/group/CCSS/channels/chan_dahdi.c Wed Nov  4 10:44:42 2009
@@ -12623,7 +12623,7 @@
 				case CPG_EVENT_PROGRESS:
 				case CPG_EVENT_INBANDINFO:
 					{
-						struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROGRESS, };
+						struct ast_frame f = { AST_FRAME_CONTROL, { AST_CONTROL_PROGRESS } };
 						ast_debug(1, "Queuing frame PROGRESS on CIC %d\n", p->cic);
 						dahdi_queue_frame(p, &f, linkset);
 						p->progress = 1;
@@ -12845,7 +12845,7 @@
 					isup_rel(ss7, e->acm.call, -1);
 					break;
 				} else {
-					struct ast_frame f = { AST_FRAME_CONTROL, AST_CONTROL_PROCEEDING, };
+					struct ast_frame f = { AST_FRAME_CONTROL, { AST_CONTROL_PROCEEDING } };
 
 					p = linkset->pvts[chanpos];
 

Modified: team/group/CCSS/include/asterisk/pbx.h
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/include/asterisk/pbx.h?view=diff&rev=227648&r1=227647&r2=227648
==============================================================================
--- team/group/CCSS/include/asterisk/pbx.h (original)
+++ team/group/CCSS/include/asterisk/pbx.h Wed Nov  4 10:44:42 2009
@@ -29,6 +29,7 @@
 #include "asterisk/hashtab.h"
 #include "asterisk/stringfields.h"
 #include "asterisk/xmldoc.h"
+#include "asterisk/frame_defs.h"
 
 #if defined(__cplusplus) || defined(c_plusplus)
 extern "C" {

Modified: team/group/CCSS/main/frame.c
URL: http://svnview.digium.com/svn/asterisk/team/group/CCSS/main/frame.c?view=diff&rev=227648&r1=227647&r2=227648
==============================================================================
--- team/group/CCSS/main/frame.c (original)
+++ team/group/CCSS/main/frame.c Wed Nov  4 10:44:42 2009
@@ -731,7 +731,7 @@
 	if (a->argc != 4)
 		return CLI_SHOWUSAGE;
 
-	if (sscanf(a->argv[3], "%30Ld", &codec) != 1)
+	if (sscanf(a->argv[3], "%30Ld", (long long *) &codec) != 1)
 		return CLI_SHOWUSAGE;
 
 	for (i = 0; i < 63; i++)
@@ -741,7 +741,7 @@
 		}
 
 	if (!found)
-		ast_cli(a->fd, "Codec %Ld not found\n", codec);
+		ast_cli(a->fd, "Codec %Ld not found\n", (long long) codec);
 
 	return CLI_SUCCESS;
 }