[asterisk-commits] russell: trunk r73399 - in /trunk: ./ channels/Makefile channels/chan_vpb.cc

[SVN commits to the Asterisk project]

Author: russell
Date: Thu Jul  5 10:29:24 2007
New Revision: 73399

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

........

Modified:
    trunk/   (props changed)
    trunk/channels/Makefile
    trunk/channels/chan_vpb.cc

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/channels/Makefile
URL: http://svn.digium.com/view/asterisk/trunk/channels/Makefile?view=diff&rev=73399&r1=73398&r2=73399
==============================================================================
--- trunk/channels/Makefile (original)
+++ trunk/channels/Makefile Thu Jul  5 10:29:24 2007
@@ -114,3 +114,5 @@
 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))

Modified: trunk/channels/chan_vpb.cc
URL: http://svn.digium.com/view/asterisk/trunk/channels/chan_vpb.cc?view=diff&rev=73399&r1=73398&r2=73399
==============================================================================
--- trunk/channels/chan_vpb.cc (original)
+++ trunk/channels/chan_vpb.cc Thu Jul  5 10:29:24 2007
@@ -340,7 +340,7 @@
 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 @@
 	/* 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 @@
 	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;