Merged revisions 84166 via svnmerge from

https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r84166 | russell | 2007-10-01 09:24:49 -0500 (Mon, 01 Oct 2007) | 2 lines

Simplify the CAN_EARLY_BRIDGE macro a bit.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@84167 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/apps/app_dial.c b/apps/app_dial.c
index 87b3dcc4f04a08dcd64e6ae0896e9247d13cec43..825a470fceed00b89f5ec418e048808a4ab0fa40 100644 (file)
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@@ -313,7 +313,9 @@ AST_APP_OPTIONS(dial_exec_options, {
        AST_APP_OPTION('W', OPT_CALLER_MONITOR),
 });
 
-#define CAN_EARLY_BRIDGE(flags) (!ast_test_flag64(flags, OPT_CALLEE_HANGUP) && !ast_test_flag64(flags, OPT_CALLER_HANGUP) && !ast_test_flag64(flags, OPT_CALLEE_TRANSFER) && !ast_test_flag64(flags, OPT_CALLER_TRANSFER) && !ast_test_flag64(flags, OPT_CALLEE_MONITOR) && !ast_test_flag64(flags, OPT_CALLER_MONITOR) && !ast_test_flag64(flags, OPT_CALLEE_PARK) && !ast_test_flag64(flags, OPT_CALLER_PARK))
+#define CAN_EARLY_BRIDGE(flags) (!ast_test_flag64(flags, OPT_CALLEE_HANGUP | \
+       OPT_CALLER_HANGUP | OPT_CALLEE_TRANSFER | OPT_CALLER_TRANSFER | \
+       OPT_CALLEE_MONITOR | OPT_CALLER_MONITOR | OPT_CALLEE_PARK | OPT_CALLER_PARK))
 
 /*
  * The list of active channels