? .loader.c.swp
? core.22765
? apps/app_voicemail.c.11-21-04
? astman/.depend
Index: indications.c
===================================================================
RCS file: /usr/cvsroot/asterisk/indications.c,v
retrieving revision 1.20
diff -u -r1.20 indications.c
--- indications.c	7 Dec 2004 20:38:43 -0000	1.20
+++ indications.c	15 Dec 2004 04:36:10 -0000
@@ -26,6 +26,7 @@
 #include <asterisk/channel.h>
 #include <asterisk/logger.h>
 #include <asterisk/lock.h>
+#include <asterisk/utils.h>
 
 struct playtones_item {
 	int freq1;
Index: include/asterisk/channel.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/channel.h,v
retrieving revision 1.63
diff -u -r1.63 channel.h
--- include/asterisk/channel.h	14 Dec 2004 23:36:30 -0000	1.63
+++ include/asterisk/channel.h	15 Dec 2004 04:36:11 -0000
@@ -231,43 +231,6 @@
 #define AST_FLAG_ZOMBIE		(1 << 4)	/* if we are a zombie */
 #define AST_FLAG_EXCEPTION	(1 << 5)	/* if there is a pending exception */
 
-static inline int ast_test_flag(struct ast_channel *chan, int mode)
-{
-	return chan->flags & mode;
-}
-
-static inline void ast_set_flag(struct ast_channel *chan, int mode)
-{
-	chan->flags |= mode;
-}
-
-static inline void ast_clear_flag(struct ast_channel *chan, int mode)
-{
-	chan->flags &= ~mode;
-}
-
-static inline void ast_copy_flags(struct ast_channel *dest, struct ast_channel *src, int flags)
-{
-	dest->flags &= ~flags;
-	dest->flags |= (src->flags & flags);
-}
-
-static inline void ast_set2_flag(struct ast_channel *chan, int value, int mode)
-{
-	if (value)
-		ast_set_flag(chan, mode);
-	else
-		ast_clear_flag(chan, mode);
-}
-
-static inline void ast_dup_flag(struct ast_channel *dstchan, struct ast_channel *srcchan, int mode)
-{
-	if (ast_test_flag(srcchan, mode))
-		ast_set_flag(dstchan, mode);
-	else
-		ast_clear_flag(dstchan, mode);
-}	
-
 struct ast_bridge_config {
 	int play_to_caller;
 	int play_to_callee;
Index: include/asterisk/utils.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/utils.h,v
retrieving revision 1.10
diff -u -r1.10 utils.h
--- include/asterisk/utils.h	17 Oct 2004 22:13:05 -0000	1.10
+++ include/asterisk/utils.h	15 Dec 2004 04:36:12 -0000
@@ -17,6 +17,19 @@
 #include <pthread.h>
 #include <asterisk/lock.h>
 
+#define ast_test_flag(p,flag) 		(p->flags & flag)
+
+#define ast_set_flag(p,flag)		(p->flags |= flag) 
+
+#define ast_clear_flag(p,flag)		(p->flags &= ~flag)
+
+#define ast_copy_flags(dest,src,flagz)	dest->flags &= ~flagz; \
+					dest->flags |= (src->flags & flagz)
+
+#define ast_set2_flag(p,value,flag)	((value) ? ast_set_flag(p,flag) : ast_clear_flag(p,flag))	
+
+#define ast_dup_flag(dst,src,flag)	(ast_test_flag(src,flag) ? ast_set_flag(dst,flag) : ast_clear_flag(dst,flag))	
+
 static inline int ast_strlen_zero(const char *s)
 {
 	return (*s == '\0');