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 /main/features.c | |
| 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 '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 d7b1bf640..4eb059711 100644 --- a/main/features.c +++ b/main/features.c @@ -2172,7 +2172,7 @@ int ast_bridge_call(struct ast_channel *chan,struct ast_channel *peer,struct ast new_peer_cdr = pick_unlocked_cdr(peer->cdr); /* the proper chan cdr, if there are forked cdrs */ if (res != AST_PBX_KEEPALIVE && config->end_bridge_callback) { - config->end_bridge_callback(); + config->end_bridge_callback(config->end_bridge_callback_data); } autoloopflag = ast_test_flag(chan, AST_FLAG_IN_AUTOLOOP); |