From 9cfdc405ed7b999a3091902893eb9426666049f9 Mon Sep 17 00:00:00 2001 From: Mark Michelson Date: Fri, 30 Jan 2009 22:24:12 +0000 Subject: [PATCH] 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: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@172609 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- include/asterisk/channel.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 357bc34e39..80783344f5 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 */