summaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
authorSean Bright <sean@malleable.com>2008-11-09 01:27:00 +0000
committerSean Bright <sean@malleable.com>2008-11-09 01:27:00 +0000
commit9ef09ad1d464defbef1775281e7666af888b6086 (patch)
tree9d9c7d00ae1f93a61488a183927f7571484ce363 /main
parentef489f81950b664d0bf226459364b29191871109 (diff)
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
Diffstat (limited to 'main')
-rw-r--r--main/features.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/main/features.c b/main/features.c
index 276328365..ed13ee4fc 100644
--- a/main/features.c
+++ b/main/features.c
@@ -2448,7 +2448,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