diff options
| author | Steve Murphy <murf@digium.com> | 2007-07-19 23:24:27 +0000 |
|---|---|---|
| committer | Steve Murphy <murf@digium.com> | 2007-07-19 23:24:27 +0000 |
| commit | 0e969271ae14e976b873327bd721eba24947545a (patch) | |
| tree | b7dc4ff6bdbb84391b8b226995daa5bb8fbde8b9 /res | |
| parent | 7756ba661904d1147e42ce884d3ebb2f128233b5 (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: https://origsvn.digium.com/svn/asterisk/trunk@75983 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'res')
| -rw-r--r-- | res/res_features.c | 2 | ||||
| -rw-r--r-- | res/res_musiconhold.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/res/res_features.c b/res/res_features.c index 20f3d0225..3f71bfadf 100644 --- a/res/res_features.c +++ b/res/res_features.c @@ -1318,7 +1318,7 @@ static int ast_feature_interpret(struct ast_channel *chan, struct ast_channel *p ast_copy_flags(&features, &(config->features_caller), AST_FLAGS_ALL); else ast_copy_flags(&features, &(config->features_callee), AST_FLAGS_ALL); - ast_debug(3, "Feature interpret: chan=%s, peer=%s, sense=%d, features=%lld\n", chan->name, peer->name, sense, (unsigned long long)features.flags); + ast_debug(3, "Feature interpret: chan=%s, peer=%s, sense=%d, features=%d\n", chan->name, peer->name, sense, features.flags); ast_rwlock_rdlock(&features_lock); for (x = 0; x < FEATURES_COUNT; x++) { diff --git a/res/res_musiconhold.c b/res/res_musiconhold.c index ce0eb8a1e..84a44f3b7 100644 --- a/res/res_musiconhold.c +++ b/res/res_musiconhold.c @@ -138,7 +138,7 @@ struct mohclass { int allowed_files; /*! The current number of files loaded into the filearray */ int total_files; - uint64_t flags; + unsigned int flags; /*! The format from the MOH source, not applicable to "files" mode */ int format; /*! The pid of the external application delivering MOH */ |