diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-09 01:34:59 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-09 01:34:59 +0000 |
| commit | 457786b0a72867e9153db746b73626f1affb3872 (patch) | |
| tree | c4ec458bd6ccc96d0a4f31ae33890b45626608ce /include | |
| parent | 43715a8e2b7cc0021a4764e979cb1403e770e36e (diff) | |
Merged revisions 155554 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
................
r155554 | seanbright | 2008-11-08 20:27:00 -0500 (Sat, 08 Nov 2008) | 14 lines
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: http://svn.digium.com/svn/asterisk/branches/1.6.0@155555 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/channel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 8d92d872d..2352ec116 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -620,7 +620,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; |