diff options
| author | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-30 22:24:12 +0000 |
|---|---|---|
| committer | mmichelson <mmichelson@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-01-30 22:24:12 +0000 |
| commit | 5902847339d4333cafec9fb95b06f40d33fa27df (patch) | |
| tree | 8018dbc9c8da2f8288ad6cf13ddd257b91f9190c /include | |
| parent | 5a2b5d30b1efc20e8c45a0e09ade68fb9d6d07fc (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.1@172609 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 357bc34e3..80783344f 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -559,7 +559,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 */ |