summaryrefslogtreecommitdiff
path: root/main/bridge.c
diff options
context:
space:
mode:
authorMatthew Jordan <mjordan@digium.com>2013-08-02 02:32:44 +0000
committerMatthew Jordan <mjordan@digium.com>2013-08-02 02:32:44 +0000
commit38236e54a84c61194c30c92b923752f0dc816d57 (patch)
treeb27d3b73accfe81703eb5f706d1447a661986f5e /main/bridge.c
parent63a229e3695514bbb15cd5ee4674b6b5bb580f0b (diff)
Remove dead code from features.c; refactor pickup code into pickup.c
This patch does the following: * It moves the pickup code out of features.c and into pickup.c * It removes the vast majority of dead code out of features.c. In particular, this includes the parking code. (issue ASTERISK-22134) git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@396060 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'main/bridge.c')
-rw-r--r--main/bridge.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/bridge.c b/main/bridge.c
index 2e2c87bc6..c0e7bd427 100644
--- a/main/bridge.c
+++ b/main/bridge.c
@@ -40,6 +40,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
#include "asterisk/bridge.h"
#include "asterisk/bridge_internal.h"
#include "asterisk/bridge_channel_internal.h"
+#include "asterisk/bridge_features.h"
#include "asterisk/bridge_basic.h"
#include "asterisk/bridge_technology.h"
#include "asterisk/bridge_channel.h"