diff options
author | Russell Bryant <russell@russellbryant.com> | 2007-10-01 14:27:02 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2007-10-01 14:27:02 +0000 |
commit | bff784d509e8dca4a71ed04adb2cf5684eee563c (patch) | |
tree | 9a3dcaa4f03dd97a3eeb03e5eaf9cc6277dc1c5e /apps/app_dial.c | |
parent | acb9d6bf2bf6cd4d9a39ae94aba275637492afd2 (diff) |
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
Diffstat (limited to 'apps/app_dial.c')
-rw-r--r-- | apps/app_dial.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/apps/app_dial.c b/apps/app_dial.c index 87b3dcc4f..825a470fc 100644 --- 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 |