diff options
| author | Joshua Colp <jcolp@digium.com> | 2006-09-26 20:51:36 +0000 |
|---|---|---|
| committer | Joshua Colp <jcolp@digium.com> | 2006-09-26 20:51:36 +0000 |
| commit | 98873d34bdbeae77f539d7d64cb57c0a43a49c27 (patch) | |
| tree | 681f0f9d281cafbb2cd86570f3c2b858258e7168 /include/asterisk | |
| parent | d34c8392929040df69924c14296fe83c12409f79 (diff) | |
Merged revisions 43707 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4
................
r43707 | file | 2006-09-26 16:47:26 -0400 (Tue, 26 Sep 2006) | 10 lines
Merged revisions 43705 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r43705 | file | 2006-09-26 16:38:06 -0400 (Tue, 26 Sep 2006) | 2 lines
Use proper type to represent the group variable (issue #8025 reported by makoto)
........
................
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@43709 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include/asterisk')
| -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 4f636d185..bf67fc9d2 100644 --- a/include/asterisk/channel.h +++ b/include/asterisk/channel.h @@ -407,8 +407,8 @@ struct ast_channel { unsigned int fout; int hangupcause; /*!< Why is the channel hanged up. See causes.h */ struct varshead varshead; /*!< A linked list for channel variables */ - unsigned int callgroup; /*!< Call group for call pickups */ - unsigned int pickupgroup; /*!< Pickup group - which calls groups can be picked up? */ + ast_group_t callgroup; /*!< Call group for call pickups */ + ast_group_t pickupgroup; /*!< Pickup group - which calls groups can be picked up? */ 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; |