From 4925e7b835eec4b0a23238844fc46db1f6d954f6 Mon Sep 17 00:00:00 2001 From: "Kevin P. Fleming" Date: Tue, 11 Mar 2008 15:13:38 +0000 Subject: Merged revisions 107464 via svnmerge from https://origsvn.digium.com/svn/asterisk/branches/1.4 ........ r107464 | kpfleming | 2008-03-11 09:53:03 -0500 (Tue, 11 Mar 2008) | 2 lines fix various other problems found by gcc 4.3 ........ git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@107466 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- channels/misdn/isdn_lib.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'channels/misdn') diff --git a/channels/misdn/isdn_lib.c b/channels/misdn/isdn_lib.c index b951e2ea8..90a6c8d36 100644 --- a/channels/misdn/isdn_lib.c +++ b/channels/misdn/isdn_lib.c @@ -2419,12 +2419,12 @@ static int handle_bchan(msg_t *msg) case PH_CONTROL|INDICATION: { - unsigned int cont = *((unsigned int *)&frm->data.p); + unsigned int *cont = (unsigned int *) &frm->data.p; cb_log(4, stack->port, "PH_CONTROL: channel:%d oad%d:%s dad%d:%s \n", bc->channel, bc->onumplan,bc->oad, bc->dnumplan,bc->dad); - if ((cont&~DTMF_TONE_MASK) == DTMF_TONE_VAL) { - int dtmf = cont & DTMF_TONE_MASK; + if ((*cont & ~DTMF_TONE_MASK) == DTMF_TONE_VAL) { + int dtmf = *cont & DTMF_TONE_MASK; cb_log(4, stack->port, " --> DTMF TONE: %c\n",dtmf); bc->dtmf=dtmf; cb_event(EVENT_DTMF_TONE, bc, glob_mgr->user_data); @@ -2432,12 +2432,12 @@ static int handle_bchan(msg_t *msg) free_msg(msg); return 1; } - if (cont == BF_REJECT) { + if (*cont == BF_REJECT) { cb_log(4, stack->port, " --> BF REJECT\n"); free_msg(msg); return 1; } - if (cont == BF_ACCEPT) { + if (*cont == BF_ACCEPT) { cb_log(4, stack->port, " --> BF ACCEPT\n"); free_msg(msg); return 1; -- cgit v1.2.3