[asterisk-commits] rmudgett: branch rmudgett/bridge_phase r390310 - /team/rmudgett/bridge_phase/...

[SVN commits to the Asterisk project]

Author: rmudgett
Date: Fri May 31 11:24:39 2013
New Revision: 390310

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=390310
Log:
Completely remove builtin_blindtransfer() to avoid a potential conflict.

Modified:
    team/rmudgett/bridge_phase/main/features.c

Modified: team/rmudgett/bridge_phase/main/features.c
URL: http://svnview.digium.com/svn/asterisk/team/rmudgett/bridge_phase/main/features.c?view=diff&rev=390310&r1=390309&r2=390310
==============================================================================
--- team/rmudgett/bridge_phase/main/features.c (original)
+++ team/rmudgett/bridge_phase/main/features.c Fri May 31 11:24:39 2013
@@ -409,6 +409,7 @@
 #define MAX_DIAL_FEATURE_OPTIONS 30
 
 /* TODO Scrape all of the parking stuff out of features.c */
+#define builtin_blindtransfer NULL	/* BUGBUG delete me when builtin_features[] is deleted. */
 
 struct feature_group_exten {
 	AST_LIST_ENTRY(feature_group_exten) entry;
@@ -2263,11 +2264,6 @@
 		s = ast_channel_context(transferer);
 	}
 	return s;
-}
-
-static int builtin_blindtransfer(struct ast_channel *chan, struct ast_channel *peer, struct ast_bridge_config *config, const char *code, int sense, void *data)
-{
-	return AST_FEATURE_RETURN_SUCCESS;
 }
 
 /*!