From: Richard Mudgett Date: Fri, 28 Jun 2013 19:05:52 +0000 (+0000) Subject: Fix overlapping enum ast_bridge_feature_flags. X-Git-Tag: 13.0.0-beta1~1597 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3aa6e93d8f4df5e31033a6799a0de666462764c2;p=thirdparty%2Fasterisk.git Fix overlapping enum ast_bridge_feature_flags. Things may no longer behave in an unexpected fashion. Local channel optimization to holding bridges will work again. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@393184 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- diff --git a/include/asterisk/bridging_features.h b/include/asterisk/bridging_features.h index 6399a22fc4..2a0511ec66 100644 --- a/include/asterisk/bridging_features.h +++ b/include/asterisk/bridging_features.h @@ -47,9 +47,9 @@ enum ast_bridge_feature_flags { /*! Bridge channels can be moved to another bridge only by masquerade (ConfBridge) */ AST_BRIDGE_FLAG_MASQUERADE_ONLY = (1 << 7), /*! Bridge does not allow transfers of channels out */ - AST_BRIDGE_FLAG_TRANSFER_PROHIBITED = (1 << 6), + AST_BRIDGE_FLAG_TRANSFER_PROHIBITED = (1 << 8), /*! Bridge transfers require transfer of entire bridge rather than individual channels */ - AST_BRIDGE_FLAG_TRANSFER_BRIDGE_ONLY = (1 << 7), + AST_BRIDGE_FLAG_TRANSFER_BRIDGE_ONLY = (1 << 9), }; /*! \brief Flags used for per bridge channel features */