chan_vpb: Fix compile error and __ast_channel_alloc() prototype const inconsistency.

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@392073 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index d1747cb066f9905dfc1bebb59980152d98b078b0..ba6b196730843fe9cbd5cb39b989549c6736293a 100644 (file)
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -2446,8 +2446,8 @@ static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state st
            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);

diff --git a/main/channel.c b/main/channel.c
index 89ab9ca36dddc8c87f5f8f0133b05bcb8881a75c..9d1ec69c27218afb263135947daa5230560732f7 100644 (file)
--- a/main/channel.c
+++ b/main/channel.c
@@ -1158,7 +1158,7 @@ __ast_channel_alloc_ap(int needqueue, int state, const char *cid_num, const char
 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, ...)
 {