aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-26 20:47:26 +0000
committerfile <file@f38db490-d61c-443f-a65b-d21fe96a405b>2006-09-26 20:47:26 +0000
commit5510826b4c716ec6242720e0668324e649dd0bc3 (patch)
tree231de065ecb1d1f388b0f9336cc078d60a4a313a /include
parent7835b86c61ad2643756cf6fd49451f61f2a97c6f (diff)
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: http://svn.digium.com/svn/asterisk/branches/1.4@43707 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'include')
-rw-r--r--include/asterisk/channel.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index d54a1bdd7..38b09bf74 100644
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -404,8 +404,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;