diff options
author | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:18:40 +0000 |
---|---|---|
committer | jpeeler <jpeeler@f38db490-d61c-443f-a65b-d21fe96a405b> | 2009-04-22 21:18:40 +0000 |
commit | 83be42020706ec98bc1455fd6f06f581ca827711 (patch) | |
tree | 9ff638dd1f2b7c9f492616301c43c6b2b927e08a /main/cli.c | |
parent | a76a20fa338807d0414c6029ae9c377d8f07f157 (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.2@190066 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/cli.c')
-rw-r--r-- | main/cli.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/main/cli.c b/main/cli.c index d6ee56adf..1d3843183 100644 --- a/main/cli.c +++ b/main/cli.c @@ -1439,7 +1439,7 @@ static char *group_show_channels(struct ast_cli_entry *e, int cmd, struct ast_cl ast_cli(a->fd, FORMAT_STRING, gi->chan->name, gi->group, (ast_strlen_zero(gi->category) ? "(default)" : gi->category)); numchans++; } - gi = AST_LIST_NEXT(gi, list); + gi = AST_LIST_NEXT(gi, group_list); } ast_app_group_list_unlock(); |