diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-25 06:24:47 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-07-25 06:24:47 +0000 |
commit | b61c7587cfab3b0aa35601dee17479e4f7f12a8d (patch) | |
tree | 064ce979174e2fff1908d92a1f2537fb664e893f /channels/chan_iax2.c | |
parent | 29cc0aa3aca3f4215469282b0c4e318b14460f3e (diff) |
Merged revisions 208749 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r208749 | jpeeler | 2009-07-25 01:23:18 -0500 (Sat, 25 Jul 2009) | 13 lines
Merged revisions 208746 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
........
r208746 | jpeeler | 2009-07-25 01:19:50 -0500 (Sat, 25 Jul 2009) | 7 lines
Fix compiling under dev-mode with gcc 4.4.0.
Mostly trivial changes, but I did not know of any other way to fix the
"dereferencing type-punned pointer will break strict-aliasing rules" error
without creating a tmp variable in chan_skinny.
........
................
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@208752 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'channels/chan_iax2.c')
-rw-r--r-- | channels/chan_iax2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c index 16898acc9..1627b4e79 100644 --- a/channels/chan_iax2.c +++ b/channels/chan_iax2.c @@ -4013,7 +4013,7 @@ static enum ast_bridge_result iax2_bridge(struct ast_channel *c0, struct ast_cha return AST_BRIDGE_FAILED; } /* Put them in native bridge mode */ - if (!flags & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) { + if ((!flags) & (AST_BRIDGE_DTMF_CHANNEL_0 | AST_BRIDGE_DTMF_CHANNEL_1)) { iaxs[callno0]->bridgecallno = callno1; iaxs[callno1]->bridgecallno = callno0; } |