Merge russell's flag macro patch (with slight mods) (bug #3046)

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@4469 f38db490-d61c-443f-a65b-d21fe96a405b

2 files changed, 11 insertions, 37 deletions

diff --git a/include/asterisk/channel.h b/include/asterisk/channel.h
index 28c566364..0a1bf0222 100755
--- a/include/asterisk/channel.h
+++ b/include/asterisk/channel.h
@@ -231,43 +231,6 @@ struct ast_channel {
 #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;
diff --git a/include/asterisk/utils.h b/include/asterisk/utils.h
index 7c47fac89..b70a1ffca 100755
--- a/include/asterisk/utils.h
+++ b/include/asterisk/utils.h
@@ -17,6 +17,17 @@
 #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)	do { dest->flags &= ~(flagz); \
+					dest->flags |= (src->flags & flagz); } while(0)
+
+#define ast_set2_flag(p,value,flag)	((value) ? ast_set_flag(p,flag) : ast_clear_flag(p,flag))	
+
 static inline int ast_strlen_zero(const char *s)
 {
 	return (*s == '\0');