Simplify the CAN_EARLY_BRIDGE macro a bit.

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@84166 65c4cc65-6c06-0410-ace0-fbb531ad65f3
19 years ago · db1ab4db58
parent 40b0f97a6c
commit db1ab4db58
1 changed files with 3 additions and 1 deletions
--- a/apps/app_dial.c
+++ b/apps/app_dial.c
@ -291,7 +291,9 @@ AST_APP_OPTIONS(dial_exec_options, {
 	AST_APP_OPTION('W', OPT_CALLER_MONITOR),
 });

-#define CAN_EARLY_BRIDGE(flags) (!ast_test_flag(flags, OPT_CALLEE_HANGUP) && !ast_test_flag(flags, OPT_CALLER_HANGUP) && !ast_test_flag(flags, OPT_CALLEE_TRANSFER) && !ast_test_flag(flags, OPT_CALLER_TRANSFER) && !ast_test_flag(flags, OPT_CALLEE_MONITOR) && !ast_test_flag(flags, OPT_CALLER_MONITOR) && !ast_test_flag(flags, OPT_CALLEE_PARK) && !ast_test_flag(flags, OPT_CALLER_PARK))
+#define CAN_EARLY_BRIDGE(flags) (!ast_test_flag(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))

 /* We define a custom "local user" structure because we
   use it not only for keeping track of what is in use but