[asterisk-commits] qwell: branch qwell/system_registry r392075 - in /team/qwell/system_registry:...

[SVN commits to the Asterisk project]

Author: qwell
Date: Mon Jun 17 13:39:24 2013
New Revision: 392075

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=392075
Log:
chan_vpb: Fix compile error and __ast_channel_alloc() prototype const inconsistency.
........

Merged revisions 392073 from http://svn.asterisk.org/svn/asterisk/trunk

Modified:
    team/qwell/system_registry/   (props changed)
    team/qwell/system_registry/channels/chan_vpb.cc
    team/qwell/system_registry/main/channel.c

Propchange: team/qwell/system_registry/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jun 17 13:39:24 2013
@@ -1,1 +1,1 @@
-/trunk:1-392065
+/trunk:1-392074

Modified: team/qwell/system_registry/channels/chan_vpb.cc
URL: http://svnview.digium.com/svn/asterisk/team/qwell/system_registry/channels/chan_vpb.cc?view=diff&rev=392075&r1=392074&r2=392075
==============================================================================
--- team/qwell/system_registry/channels/chan_vpb.cc (original)
+++ team/qwell/system_registry/channels/chan_vpb.cc Mon Jun 17 13:39:24 2013
@@ -2446,8 +2446,8 @@
 	    return NULL;
 	}
 	ast_verb(4, "%s: New call for context [%s]\n", me->dev, context);
-	    
-	tmp = ast_channel_alloc(1, state, 0, 0, "", me->ext, me->context, linkedid, 0, "%s", me->dev);
+
+	tmp = ast_channel_alloc(1, state, 0, 0, "", me->ext, me->context, linkedid, AST_AMA_NONE, "%s", me->dev);
 	if (tmp) {
 		if (use_ast_ind == 1){
 			ast_channel_tech_set(tmp, &vpb_tech_indicate);

Modified: team/qwell/system_registry/main/channel.c
URL: http://svnview.digium.com/svn/asterisk/team/qwell/system_registry/main/channel.c?view=diff&rev=392075&r1=392074&r2=392075
==============================================================================
--- team/qwell/system_registry/main/channel.c (original)
+++ team/qwell/system_registry/main/channel.c Mon Jun 17 13:39:24 2013
@@ -1158,7 +1158,7 @@
 struct ast_channel *__ast_channel_alloc(int needqueue, int state, const char *cid_num,
 					const char *cid_name, const char *acctcode,
 					const char *exten, const char *context,
-					const char *linkedid, const enum ama_flags amaflag,
+					const char *linkedid, enum ama_flags amaflag,
 					const char *file, int line, const char *function,
 					const char *name_fmt, ...)
 {