diff options
| author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:17:29 +0000 |
|---|---|---|
| committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:17:29 +0000 |
| commit | 32e8acd7cfed3e30d7e655ede7b2114e6b2db035 (patch) | |
| tree | 3224868456b5100d5d275aa21c72a92227d9bb1e /funcs | |
| parent | ad7c308be300ee7fa074ec016c800d3bb407f50c (diff) | |
Merged revisions 190057 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk
........
r190057 | jpeeler | 2009-04-22 16:15:55 -0500 (Wed, 22 Apr 2009) | 9 lines
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/branches/1.6.0@190059 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'funcs')
| -rw-r--r-- | funcs/func_groupcount.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/funcs/func_groupcount.c b/funcs/func_groupcount.c index f0d7df1b5..47fb9eabf 100644 --- a/funcs/func_groupcount.c +++ b/funcs/func_groupcount.c @@ -45,7 +45,7 @@ static int group_count_function_read(struct ast_channel *chan, const char *cmd, struct ast_group_info *gi = NULL; ast_app_group_list_rdlock(); - for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, list)) { + for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, group_list)) { if (gi->chan != chan) continue; if (ast_strlen_zero(category) || (!ast_strlen_zero(gi->category) && !strcasecmp(gi->category, category))) @@ -115,7 +115,7 @@ static int group_function_read(struct ast_channel *chan, const char *cmd, ast_app_group_list_rdlock(); - for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, list)) { + for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, group_list)) { if (gi->chan != chan) continue; if (ast_strlen_zero(data)) @@ -171,7 +171,7 @@ static int group_list_function_read(struct ast_channel *chan, const char *cmd, ast_app_group_list_rdlock(); - for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, list)) { + for (gi = ast_app_group_list_head(); gi; gi = AST_LIST_NEXT(gi, group_list)) { if (gi->chan != chan) continue; if (!ast_strlen_zero(tmp1)) { |