diff options
| author | Jonathan Rose <jrose@digium.com> | 2012-03-29 19:59:30 +0000 |
|---|---|---|
| committer | Jonathan Rose <jrose@digium.com> | 2012-03-29 19:59:30 +0000 |
| commit | d501c2ea2d56ece966b6615799dd7b66198176dd (patch) | |
| tree | 33ad80dfb8a5751b7d76e748621055083315251d /include/asterisk/bridging.h | |
| parent | bf994f0e04696ba11ce0ec81df7880d61ef9c779 (diff) | |
undoing 360785 due to merging mistake
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@360786 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk/bridging.h')
| -rw-r--r-- | include/asterisk/bridging.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/asterisk/bridging.h b/include/asterisk/bridging.h index 831f340c8..3c117b7cd 100644 --- a/include/asterisk/bridging.h +++ b/include/asterisk/bridging.h @@ -165,8 +165,6 @@ struct ast_bridge_channel { struct ast_bridge_tech_optimizations tech_args; /*! Queue of DTMF digits used for DTMF streaming */ char dtmf_stream_q[8]; - /*! Call ID associated with bridge channel */ - struct ast_callid *callid; /*! Linked list information */ AST_LIST_ENTRY(ast_bridge_channel) entry; }; @@ -245,11 +243,9 @@ struct ast_bridge { size_t array_num; /*! Number of channels the array can handle */ size_t array_size; - /*! Call ID associated with the bridge */ - struct ast_callid *callid; /*! Linked list of channels participating in the bridge */ AST_LIST_HEAD_NOLOCK(, ast_bridge_channel) channels; - }; +}; /*! \brief Create a new bridge * |