[Asterisk-cvs] asterisk/include/asterisk channel.h, 1.71, 1.72 utils.h, 1.16, 1.17 vmodem.h, 1.12, 1.13

[markster at lists.digium.com]

Update of /usr/cvsroot/asterisk/include/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv4629/include/asterisk

Modified Files:
	channel.h utils.h vmodem.h 
Log Message:
Make groups be 64-bits (bug #3351, with mods)


Index: channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.71
retrieving revision 1.72
diff -u -d -r1.71 -r1.72
--- channel.h	10 Jan 2005 14:46:59 -0000	1.71
+++ channel.h	15 Jan 2005 21:51:38 -0000	1.72
@@ -46,6 +46,8 @@
 
 #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 @@
 									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)
 }

Index: utils.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/utils.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- utils.h	10 Jan 2005 14:46:59 -0000	1.16
+++ utils.h	15 Jan 2005 21:51:38 -0000	1.17
@@ -153,6 +153,3 @@
 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);

Index: vmodem.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/vmodem.h,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- vmodem.h	2 Oct 2004 00:58:31 -0000	1.12
+++ vmodem.h	15 Jan 2005 21:51:38 -0000	1.13
@@ -116,7 +116,7 @@
 	/*! 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 */