From: Russell Bryant <russell@russellbryant.com>
Date: Thu, 5 Jul 2007 15:29:24 +0000 (+0000)
Subject: Merged revisions 73398 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~2153
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a7961ac41f1069871dbcdfa336ef03111c203fd5;p=thirdparty%2Fasterisk.git

Merged revisions 73398 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r73398 | russell | 2007-07-05 10:28:27 -0500 (Thu, 05 Jul 2007) | 2 lines

Make this module build for me in dev-mode

........


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

diff --git a/channels/Makefile b/channels/Makefile
index 3515532a1f..beba0d1ff6 100644
--- a/channels/Makefile
+++ b/channels/Makefile
@@ -114,3 +114,5 @@ misdn_config.o: ASTCFLAGS+=-Imisdn
 misdn/isdn_lib.o: ASTCFLAGS+=-Wno-strict-aliasing
 
 $(if $(filter chan_misdn,$(EMBEDDED_MODS)),modules.link,chan_misdn.so): chan_misdn.o misdn_config.o misdn/isdn_lib.o misdn/isdn_msg_parser.o
+
+chan_vpb.oo: ASTCFLAGS:=$(filter-out -Wdeclaration-after-statement,$(ASTCFLAGS))
diff --git a/channels/chan_vpb.cc b/channels/chan_vpb.cc
index 8e38409e5d..3cc76d66e7 100644
--- a/channels/chan_vpb.cc
+++ b/channels/chan_vpb.cc
@@ -340,7 +340,7 @@ static struct ast_channel *vpb_new(struct vpb_pvt *i, enum ast_channel_state sta
 static void *do_chanreads(void *pvt);
 static struct ast_channel *vpb_request(const char *type, int format, void *data, int *cause);
 static int vpb_digit_begin(struct ast_channel *ast, char digit);
-static int vpb_digit_end(struct ast_channel *ast, char digit);
+static int vpb_digit_end(struct ast_channel *ast, char digit, unsigned int duration);
 static int vpb_call(struct ast_channel *ast, char *dest, int timeout);
 static int vpb_hangup(struct ast_channel *ast);
 static int vpb_answer(struct ast_channel *ast);
@@ -1830,7 +1830,7 @@ static int vpb_digit_begin(struct ast_channel *ast, char digit)
 	/* XXX Modify this callback to let Asterisk control the length of DTMF */
 	return 0;
 }
-static int vpb_digit_end(struct ast_channel *ast, char digit)
+static int vpb_digit_end(struct ast_channel *ast, char digit, unsigned int duration)
 {
 	struct vpb_pvt *p = (struct vpb_pvt *)ast->tech_pvt;
 	char s[2];
@@ -2625,7 +2625,7 @@ static struct ast_channel *vpb_new(struct vpb_pvt *me, enum ast_channel_state st
 	if (option_verbose > 3)
 		ast_verbose("%s: New call for context [%s]\n",me->dev,context);
 	    
-	tmp = ast_channel_alloc(1, state, 0, 0, "", me->exten, me->context, 0, me->dev);
+	tmp = ast_channel_alloc(1, state, 0, 0, "", me->ext, me->context, 0, me->dev);
 	if (tmp) {
 		if (use_ast_ind == 1){
 			tmp->tech = &vpb_tech_indicate;