diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:15:55 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:15:55 +0000 |
| commit | f3943d366244e247fb3b22ef50c291b64b9709c5 (patch) | |
| tree | 5a632762f1665dad4db9749279a8a216d0a9dd90 /main/app.c | |
| parent | a4012d9519797a6fa5555b486f8ff87289900a04 (diff) | |
Fix building of chan_h323 with gcc-3.3
There seems to be a bug with old versions of g++ that doesn't allow a structure
member to use the name list. Rename list member to group_list in ast_group_info
and change the few places it is used.
(closes issue #14790)
Reported by: stuarth
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@190057 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/app.c')
| -rw-r--r-- | main/app.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/main/app.c b/main/app.c index b94657b4c..8e28b0c9a 100644 --- a/main/app.c +++ b/main/app.c @@ -1014,9 +1014,9 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data) } AST_RWLIST_WRLOCK(&groups); - AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) { + AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, group_list) { if ((gi->chan == chan) && ((ast_strlen_zero(category) && ast_strlen_zero(gi->category)) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) { - AST_RWLIST_REMOVE_CURRENT(list); + AST_RWLIST_REMOVE_CURRENT(group_list); free(gi); break; } @@ -1033,7 +1033,7 @@ int ast_app_group_set_channel(struct ast_channel *chan, const char *data) gi->category = (char *) gi + sizeof(*gi) + strlen(group) + 1; strcpy(gi->category, category); } - AST_RWLIST_INSERT_TAIL(&groups, gi, list); + AST_RWLIST_INSERT_TAIL(&groups, gi, group_list); } else { res = -1; } @@ -1053,7 +1053,7 @@ int ast_app_group_get_count(const char *group, const char *category) } AST_RWLIST_RDLOCK(&groups); - AST_RWLIST_TRAVERSE(&groups, gi, list) { + AST_RWLIST_TRAVERSE(&groups, gi, group_list) { if (!strcasecmp(gi->group, group) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) { count++; } @@ -1079,7 +1079,7 @@ int ast_app_group_match_get_count(const char *groupmatch, const char *category) } AST_RWLIST_RDLOCK(&groups); - AST_RWLIST_TRAVERSE(&groups, gi, list) { + AST_RWLIST_TRAVERSE(&groups, gi, group_list) { if (!regexec(®exbuf, gi->group, 0, NULL, 0) && (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category)))) { count++; } @@ -1096,11 +1096,11 @@ int ast_app_group_update(struct ast_channel *old, struct ast_channel *new) struct ast_group_info *gi = NULL; AST_RWLIST_WRLOCK(&groups); - AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) { + AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, group_list) { if (gi->chan == old) { gi->chan = new; } else if (gi->chan == new) { - AST_RWLIST_REMOVE_CURRENT(list); + AST_RWLIST_REMOVE_CURRENT(group_list); ast_free(gi); } } @@ -1115,9 +1115,9 @@ int ast_app_group_discard(struct ast_channel *chan) struct ast_group_info *gi = NULL; AST_RWLIST_WRLOCK(&groups); - AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, list) { + AST_RWLIST_TRAVERSE_SAFE_BEGIN(&groups, gi, group_list) { if (gi->chan == chan) { - AST_RWLIST_REMOVE_CURRENT(list); + AST_RWLIST_REMOVE_CURRENT(group_list); ast_free(gi); } } |