Make groups be 64-bits (bug #3351, with mods)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4803 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Mark Spencer
2005-01-15 21:51:38 +00:00
parent a0e6229adb
commit 96503a02c1
11 changed files with 65 additions and 64 deletions

View File

@@ -46,6 +46,8 @@ extern "C" {
#define AST_MAX_FDS 8
typedef unsigned long long ast_group_t;
struct ast_generator {
void *(*alloc)(struct ast_channel *chan, void *params);
void (*release)(struct ast_channel *chan, void *data);
@@ -887,7 +889,10 @@ static inline int ast_select(int nfds, fd_set *rfds, fd_set *wfds, fd_set *efds,
ast_set_flag(c, AST_FLAG_BLOCKING); \
} }
extern unsigned int ast_get_group(char *s);
extern ast_group_t ast_get_group(char *s);
/* print call- and pickup groups into buffer */
extern char *ast_print_group(char *buf, int buflen, ast_group_t group);
#if defined(__cplusplus) || defined(c_plusplus)
}

View File

@@ -153,6 +153,3 @@ extern int ast_pthread_create(pthread_t *thread, pthread_attr_t *attr, void *(*s
extern char *ast_strcasestr(const char *, const char *);
#endif
/* print call- and pickup groups into buffer */
char *ast_print_group(char *buf, int buflen, unsigned int group);

View File

@@ -116,7 +116,7 @@ struct ast_modem_pvt {
/*! Multiple Subscriber Number we accept for outgoing calls (; seperated list) */
char outgoingmsn[AST_MAX_EXTENSION];
/*! Group(s) we belong to if available */
unsigned int group;
ast_group_t group;
/*! Caller ID if available */
char cid_name[AST_MAX_EXTENSION];
/*! Caller ID if available */