[Asterisk-cvs] asterisk/include/asterisk utils.h,1.11,1.12

[markster at lists.digium.com]

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

Modified Files:
	utils.h 
Log Message:
Merge drumkilla's bitfield patch for SIP (bug #3083)


Index: utils.h
===================================================================
RCS file: /usr/cvsroot/asterisk/include/asterisk/utils.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- utils.h	16 Dec 2004 03:15:20 -0000	1.11
+++ utils.h	19 Dec 2004 20:50:55 -0000	1.12
@@ -23,8 +23,8 @@
 
 #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_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))	
 
@@ -38,6 +38,9 @@
 	char buf[1024];
 };
 
+struct ast_flags {
+	int flags;
+};
 
 extern char *ast_strip(char *buf);
 extern struct hostent *ast_gethostbyname(const char *host, struct ast_hostent *hp);