[svn-commits] file: branch file/bridging r180366 - /team/file/bridging/include/asterisk/

[SVN commits to the Digium repositories]

Author: file
Date: Thu Mar  5 11:09:16 2009
New Revision: 180366

URL: http://svn.digium.com/svn-view/asterisk?view=rev&rev=180366
Log:
I haz stolen unused_old_dtmfq.

Modified:
    team/file/bridging/include/asterisk/channel.h

Modified: team/file/bridging/include/asterisk/channel.h
URL: http://svn.digium.com/svn-view/asterisk/team/file/bridging/include/asterisk/channel.h?view=diff&rev=180366&r1=180365&r2=180366
==============================================================================
--- team/file/bridging/include/asterisk/channel.h (original)
+++ team/file/bridging/include/asterisk/channel.h Thu Mar  5 11:09:16 2009
@@ -406,7 +406,6 @@
 	void *music_state;				/*!< Music State*/
 	void *generatordata;				/*!< Current generator data if there is any */
 	struct ast_generator *generator;		/*!< Current active data generator */
-	struct ast_bridge *bridge;                      /*!< Bridge this channel is participating in */
 	struct ast_channel *_bridge;			/*!< Who are we bridged to, if we're bridged.
 							     Who is proxying for us, if we are proxied (i.e. chan_agent).
 							     Do not access directly, use ast_bridged_channel(chan) */
@@ -497,7 +496,11 @@
 
 	unsigned short transfercapability;		/*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */
 
-	char unused_old_dtmfq[AST_MAX_EXTENSION];			/*!< (deprecated, use readq instead) Any/all queued DTMF characters */
+	union {
+		char unused_old_dtmfq[AST_MAX_EXTENSION];			/*!< (deprecated, use readq instead) Any/all queued DTMF characters */
+		struct ast_bridge *bridge;                                      /*!< Bridge this channel is participating in */
+	};
+
 	char context[AST_MAX_CONTEXT];			/*!< Dialplan: Current extension context */
 	char exten[AST_MAX_EXTENSION];			/*!< Dialplan: Current extension number */
 	char macrocontext[AST_MAX_CONTEXT];		/*!< Macro: Current non-macro context. See app_macro.c */