diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-30 22:23:11 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-30 22:23:11 +0000 |
| commit | 3429e6951c2ff9c5c4c67c68b39978a3f0785077 (patch) | |
| tree | 14b0f1a093b249055b3070f7fdd98ef9555b829a /include | |
| parent | b1aaf7ed30d4a31d4dcbe1387934dfdfa0560a8a (diff) | |
Merged revisions 172598 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r172598 | mmichelson | 2009-01-30 16:22:04 -0600 (Fri, 30 Jan 2009) | 3 lines
Fix redefinition of flag in channel.h
........
git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@172604 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 5c709d97a..1068a2f33 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -595,7 +595,7 @@ enum { /*! This flag indicates that the hangup exten should NOT be run when the * bridge terminates, this will allow the hangup in the pbx loop to be run instead. * */ - AST_FLAG_BRIDGE_HANGUP_DONT = (1 << 17), + AST_FLAG_BRIDGE_HANGUP_DONT = (1 << 18), }; /*! \brief ast_bridge_config flags */ |