diff options
author | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-19 23:24:27 +0000 |
---|---|---|
committer | murf <murf@f38db490-d61c-443f-a65b-d21fe96a405b> | 2007-07-19 23:24:27 +0000 |
commit | 77f799ff1eab72ca12a0b89f48f7b4907c44e2be (patch) | |
tree | b7dc4ff6bdbb84391b8b226995daa5bb8fbde8b9 /include/asterisk/channel.h | |
parent | 5bc0b2d273087883a17b7804240030a322292279 (diff) |
After some study, thought, comparing, etc. I've backed out the previous universal mod to make ast_flags a 64 bit thing. Instead, I added a 64-bit version of ast_flags (ast_flags64), and 64-bit versions of the test-flag, set-flag, etc. macros, and an app_parse_options64 routine, and I use these in app_dial alone, to eliminate the 30-option limit it had grown to meet. There is room now for 32 more options and flags. I was heavily tempted to implement some of the other ideas that were presented, but this solution does not intro any new versions of dial, doesn't have a different API, has a minimal/zero impact on code outside of dial, and doesn't seriously (I hope) affect the code structure of dial. It's the best I can think of right now. My goal was NOT to rewrite dial. I leave that to a future, coordinated effort.
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@75983 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include/asterisk/channel.h')
-rw-r--r-- | include/asterisk/channel.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h index 0a5b7c1a0..9bfc3dd4d 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -468,7 +468,7 @@ struct ast_channel { (see \ref AstChanVar ) */ ast_group_t callgroup; /*!< Call group for call pickups */ ast_group_t pickupgroup; /*!< Pickup group - which calls groups can be picked up? */ - uint64_t flags; /*!< channel flags of AST_FLAG_ type */ + unsigned int flags; /*!< channel flags of AST_FLAG_ type */ unsigned short transfercapability; /*!< ISDN Transfer Capbility - AST_FLAG_DIGITAL is not enough */ AST_LIST_HEAD_NOLOCK(, ast_frame) readq; int alertpipe[2]; @@ -567,7 +567,7 @@ struct ast_bridge_config { const char *end_sound; const char *start_sound; int firstpass; - uint64_t flags; + unsigned int flags; }; struct chanmon; |