Merged revisions 155553 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r155553 | seanbright | 2008-11-08 20:08:07 -0500 (Sat, 08 Nov 2008) | 6 lines

Use static functions here instead of nested ones.  This requires a small
change to the ast_bridge_config struct as well.  To understand the reason
for this change, see the following post:

    http://gcc.gnu.org/ml/gcc-help/2008-11/msg00049.html

........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@155554 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Sean Bright
2008-11-09 01:27:00 +00:00
parent ef489f8195
commit 9ef09ad1d4
5 changed files with 57 additions and 51 deletions

View File

@@ -584,7 +584,8 @@ struct ast_bridge_config {
const char *start_sound;
int firstpass;
unsigned int flags;
void (* end_bridge_callback)(void); /*!< A callback that is called after a bridge attempt */
void (* end_bridge_callback)(void *); /*!< A callback that is called after a bridge attempt */
void *end_bridge_callback_data; /*!< Data passed to the callback */
};
struct chanmon;