diff options
| author | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-09 01:43:14 +0000 |
|---|---|---|
| committer | seanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b> | 2008-11-09 01:43:14 +0000 |
| commit | bee3f58aa636ce684b50226753a508acf701a65b (patch) | |
| tree | 508b72c8c49320b5add60ad55992311464790088 /main/features.c | |
| parent | 6297955c144166d5587cb2631403fa96f215fbfb (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.1@155556 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/features.c')
| -rw-r--r-- | main/features.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c index b733ac9e9..03eba9103 100644 --- a/main/features.c +++ b/main/features.c @@ -2381,7 +2381,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast } before_you_go: if (res != AST_PBX_KEEPALIVE && config->end_bridge_callback) { - config->end_bridge_callback(); + config->end_bridge_callback(config->end_bridge_callback_data); } /* run the hangup exten on the chan object IFF it was NOT involved in a parking situation |