diff options
| author | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-05 15:29:24 +0000 |
|---|---|---|
| committer | russell <russell@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-05 15:29:24 +0000 |
| commit | c171af506b537f7a13e5c61e9cdf22c9737e09f8 (patch) | |
| tree | 69f17d94df0a047718e7b00d07e0ceb65888e3ec | |
| parent | 39e36cc871fab7d849e0c12d9ec0ebd423af3bab (diff) | |
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: http://svn.digium.com/svn/asterisk/trunk@73399 f38db490-d61c-443f-a65b-d21fe96a405b
| -rw-r--r-- | channels/Makefile | 2 | ||||
| -rw-r--r-- | channels/chan_vpb.cc | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/channels/Makefile b/channels/Makefile index 3515532a1..beba0d1ff 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 8e38409e5..3cc76d66e 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; |