bunkus: Encapsulated arguments to #define in ( ... ) so that the #defines can be safely used like functions: mydef(flag ? val1 : val2)

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8958 b3059339-0415-0410-9bf9-f77b7e298cf2

13 files changed, 32 insertions, 32 deletions

diff --git a/Gui/wm/ws.h b/Gui/wm/ws.h
index bd0b6c802d..f14b01483a 100644
--- a/Gui/wm/ws.h
+++ b/Gui/wm/ws.h
@@ -254,7 +254,7 @@ extern int  wsGetOutMask( void );
 extern void wsScreenSaverOn( Display *mDisplay );
 extern void wsScreenSaverOff( Display * mDisplay );
 
-#define wgIsRect( X,Y,tX,tY,bX,bY ) ( ( X > tX )&&( Y > tY )&&( X < bX )&&( Y < bY ) )
+#define wgIsRect( X,Y,tX,tY,bX,bY ) ( ( (X) > (tX) )&&( (Y) > (tY) )&&( (X) < (bX) )&&( (Y) < (bY) ) )
 
 #endif
 
diff --git a/Gui/wm/wsxdnd.h b/Gui/wm/wsxdnd.h
index 8d88aeacdc..19eaffd541 100644
--- a/Gui/wm/wsxdnd.h
+++ b/Gui/wm/wsxdnd.h
@@ -17,7 +17,7 @@ void wsXDNDClearAwareness(wsTWindow* window);
 #define XDND_ENTER_THREE_TYPES_SET(e,b)	(e)->xclient.data.l[1] = ((e)->xclient.data.l[1] & ~0x1UL) | (((b) == 0) ? 0 : 0x1UL)
 #define XDND_ENTER_VERSION(e)		((e)->xclient.data.l[1] >> 24)
 #define XDND_ENTER_VERSION_SET(e,v)	(e)->xclient.data.l[1] = ((e)->xclient.data.l[1] & ~(0xFF << 24)) | ((v) << 24)
-#define XDND_ENTER_TYPE(e,i)		((e)->xclient.data.l[2 + i])	/* i => (0, 1, 2) */
+#define XDND_ENTER_TYPE(e,i)		((e)->xclient.data.l[2 + (i)])	/* i => (0, 1, 2) */
 
 /* XdndPosition */
 #define XDND_POSITION_SOURCE_WIN(e)	((e)->xclient.data.l[0])
diff --git a/drivers/radeon/radeon_vid.h b/drivers/radeon/radeon_vid.h
index 1c555863c7..e9898a56e7 100644
--- a/drivers/radeon/radeon_vid.h
+++ b/drivers/radeon/radeon_vid.h
@@ -52,11 +52,11 @@ uint32_t num_frames;
 #define IMGFMT_BGR24 (IMGFMT_BGR|24)
 #define IMGFMT_BGR32 (IMGFMT_BGR|32)
 
-#define IMGFMT_IS_RGB(fmt) ((fmt&IMGFMT_RGB_MASK)==IMGFMT_RGB)
-#define IMGFMT_IS_BGR(fmt) ((fmt&IMGFMT_BGR_MASK)==IMGFMT_BGR)
+#define IMGFMT_IS_RGB(fmt) (((fmt)&IMGFMT_RGB_MASK)==IMGFMT_RGB)
+#define IMGFMT_IS_BGR(fmt) (((fmt)&IMGFMT_BGR_MASK)==IMGFMT_BGR)
 
-#define IMGFMT_RGB_DEPTH(fmt) (fmt&~IMGFMT_RGB)
-#define IMGFMT_BGR_DEPTH(fmt) (fmt&~IMGFMT_BGR)
+#define IMGFMT_RGB_DEPTH(fmt) ((fmt)&~IMGFMT_RGB)
+#define IMGFMT_BGR_DEPTH(fmt) ((fmt)&~IMGFMT_BGR)
 
 
 /* Planar YUV Formats */
diff --git a/libaf/af.h b/libaf/af.h
index 4fbb54291a..4cf6dfa6d6 100644
--- a/libaf/af.h
+++ b/libaf/af.h
@@ -247,8 +247,8 @@ extern af_msg_cfg_t af_msg_cfg; // Message
 /* Macro for printing error messages */
 #ifndef af_msg
 #define af_msg(lev, args... ) \
-((lev<AF_MSG_WARN)?(fprintf(af_msg_cfg.err?af_msg_cfg.err:stderr, ## args )): \
-((lev<=af_msg_cfg.level)?(fprintf(af_msg_cfg.msg?af_msg_cfg.msg:stdout, ## args )):0))
+(((lev)<AF_MSG_WARN)?(fprintf(af_msg_cfg.err?af_msg_cfg.err:stderr, ## args )): \
+(((lev)<=af_msg_cfg.level)?(fprintf(af_msg_cfg.msg?af_msg_cfg.msg:stdout, ## args )):0))
 #endif
 
 #endif /* __aop_h__ */
diff --git a/libaf/af_mp.h b/libaf/af_mp.h
index 68cbf790da..7e27f801e6 100644
--- a/libaf/af_mp.h
+++ b/libaf/af_mp.h
@@ -18,7 +18,7 @@
 #undef af_msg
 #endif
 #define af_msg(lev, args... ) \
-  mp_msg(MSGT_AFILTER,((lev<0)?(lev+3):((lev==0)?MSGL_INFO:(lev+5))), ##args )
+  mp_msg(MSGT_AFILTER,(((lev)<0)?((lev)+3):(((lev)==0)?MSGL_INFO:((lev)+5))), ##args )
 
 /* Decodes the format from mplayer format to libaf format */
 extern int af_format_decode(int format);
diff --git a/libaf/af_resample.h b/libaf/af_resample.h
index 4f373e2c06..34e05cdfbe 100644
--- a/libaf/af_resample.h
+++ b/libaf/af_resample.h
@@ -66,8 +66,8 @@
 
 // Macro to add data to circular que 
 #define ADDQUE(xi,xq,in)\
-  xq[xi]=xq[xi+L]=(*in);\
-  xi=(xi-1)&(L-1);
+  xq[xi]=xq[(xi)+L]=*(in);\
+  xi=((xi)-1)&(L-1);
 
 #if defined(UP)
 
diff --git a/libaf/filter.h b/libaf/filter.h
index 307760d856..5f59c0e596 100644
--- a/libaf/filter.h
+++ b/libaf/filter.h
@@ -63,7 +63,7 @@ extern int szxform(_ftype_t* a, _ftype_t* b, _ftype_t Q, _ftype_t fc, _ftype_t f
    long. 
 */
 #define updateq(n,xi,xq,in)\
-  xq[xi]=xq[xi+n]=*in;\
-  xi=(++xi)&(n-1);
+  xq[xi]=(xq)[(xi)+(n)]=*(in);\
+  xi=(++(xi))&((n)-1);
 
 #endif
diff --git a/libmpcodecs/img_format.h b/libmpcodecs/img_format.h
index 7df922e622..e1876c20c7 100644
--- a/libmpcodecs/img_format.h
+++ b/libmpcodecs/img_format.h
@@ -24,11 +24,11 @@
 #define IMGFMT_BGR24 (IMGFMT_BGR|24)
 #define IMGFMT_BGR32 (IMGFMT_BGR|32)
 
-#define IMGFMT_IS_RGB(fmt) ((fmt&IMGFMT_RGB_MASK)==IMGFMT_RGB)
-#define IMGFMT_IS_BGR(fmt) ((fmt&IMGFMT_BGR_MASK)==IMGFMT_BGR)
+#define IMGFMT_IS_RGB(fmt) (((fmt)&IMGFMT_RGB_MASK)==IMGFMT_RGB)
+#define IMGFMT_IS_BGR(fmt) (((fmt)&IMGFMT_BGR_MASK)==IMGFMT_BGR)
 
-#define IMGFMT_RGB_DEPTH(fmt) (fmt&~IMGFMT_RGB)
-#define IMGFMT_BGR_DEPTH(fmt) (fmt&~IMGFMT_BGR)
+#define IMGFMT_RGB_DEPTH(fmt) ((fmt)&~IMGFMT_RGB)
+#define IMGFMT_BGR_DEPTH(fmt) ((fmt)&~IMGFMT_BGR)
 
 
 /* Planar YUV Formats */
diff --git a/libmpdemux/asf.h b/libmpdemux/asf.h
index c6fc30a4e4..5877fb64d8 100644
--- a/libmpdemux/asf.h
+++ b/libmpdemux/asf.h
@@ -6,7 +6,7 @@
 #include "bswap.h"
 
 #ifndef MIN
-#define MIN(a,b) ((a<b)?a:b)
+#define MIN(a,b) (((a)<(b))?(a):(b))
 #endif
 
 ///////////////////////
diff --git a/libmpeg2/attributes.h b/libmpeg2/attributes.h
index 3e14cab271..ab7105c2df 100644
--- a/libmpeg2/attributes.h
+++ b/libmpeg2/attributes.h
@@ -21,7 +21,7 @@
 
 /* use gcc attribs to align critical data structures */
 #ifdef ATTRIBUTE_ALIGNED_MAX
-#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < align) ? ATTRIBUTE_ALIGNED_MAX : align)))
+#define ATTR_ALIGN(align) __attribute__ ((__aligned__ ((ATTRIBUTE_ALIGNED_MAX < (align)) ? ATTRIBUTE_ALIGNED_MAX : (align))))
 #else
 #define ATTR_ALIGN(align)
 #endif
diff --git a/mp_msg.h b/mp_msg.h
index 6e15a2c5e3..c8ab0da6c9 100644
--- a/mp_msg.h
+++ b/mp_msg.h
@@ -93,7 +93,7 @@ int mp_msg_test(int mod, int lev);
 
 #ifdef TARGET_OS2
 // va_start/vsnprintf seems to be broken under OS2 :(
-#define mp_msg(mod,lev, fmt, args... ) do{if(lev<=mp_msg_levels[mod]) printf( fmt, ## args );}while(0)
+#define mp_msg(mod,lev, fmt, args... ) do{if((lev)<=mp_msg_levels[mod]) printf( fmt, ## args );}while(0)
 #define mp_dbg(mod,lev, args... ) 
 #else
 
@@ -108,19 +108,19 @@ int mp_msg_test(int mod, int lev);
 void mp_msg_c( int x, const char *format, ... );
 
 #ifdef __GNUC__
-#define mp_msg(mod,lev, args... ) mp_msg_c((mod<<8)|lev, ## args )
+#define mp_msg(mod,lev, args... ) mp_msg_c(((mod)<<8)|(lev), ## args )
 
 #ifdef MP_DEBUG
-#define mp_dbg(mod,lev, args... ) mp_msg_c((mod<<8)|lev, ## args )
+#define mp_dbg(mod,lev, args... ) mp_msg_c(((mod)<<8)|(lev), ## args )
 #else
 // these messages are only usefull for developers, disable them
 #define mp_dbg(mod,lev, args... ) 
 #endif
 #else // not GNU C
-#define mp_msg(mod,lev, ... ) mp_msg_c((mod<<8)|lev, __VA_ARGS__)
+#define mp_msg(mod,lev, ... ) mp_msg_c(((mod)<<8)|(lev), __VA_ARGS__)
 
 #ifdef MP_DEBUG
-#define mp_dbg(mod,lev, ... ) mp_msg_c((mod<<8)|lev, __VA_ARGS__)
+#define mp_dbg(mod,lev, ... ) mp_msg_c(((mod)<<8)|(lev), __VA_ARGS__)
 #else
 // these messages are only usefull for developers, disable them
 #define mp_dbg(mod,lev, ... ) 
diff --git a/vidix/drivers/cyberblade_regs.h b/vidix/drivers/cyberblade_regs.h
index 4b0c2b1b81..6d73692ac1 100644
--- a/vidix/drivers/cyberblade_regs.h
+++ b/vidix/drivers/cyberblade_regs.h
@@ -129,10 +129,10 @@
 
 int HACKBUCKET12345678;  /* Horrible hack to work around cache/speed issue */
 
-#define INB(addr) (HACKBUCKET12345678=*(cyberblade_reg_base+addr))
-#define INW(addr) (HACKBUCKET12345678=*(unsigned short *)(cyberblade_reg_base+addr))
-#define OUTB(addr,val) (*(cyberblade_reg_base+addr)=(val))
-#define OUTW(addr,val) (*(unsigned short *)(cyberblade_reg_base+addr)=(val))
+#define INB(addr) (HACKBUCKET12345678=*(cyberblade_reg_base+(addr)))
+#define INW(addr) (HACKBUCKET12345678=*(unsigned short *)(cyberblade_reg_base+(addr)))
+#define OUTB(addr,val) (*(cyberblade_reg_base+(addr))=(val))
+#define OUTW(addr,val) (*(unsigned short *)(cyberblade_reg_base+(addr))=(val))
 
 #define SRINB(reg) (OUTB(0x3c4,reg), INB(0x3c5))
 #define SROUTB(reg,val) (OUTW(0x3c4,((val)<<8)|(reg)))
diff --git a/vidix/drivers/pm3_regs.h b/vidix/drivers/pm3_regs.h
index c976c32107..30c717f44b 100644
--- a/vidix/drivers/pm3_regs.h
+++ b/vidix/drivers/pm3_regs.h
@@ -1060,10 +1060,10 @@
 extern void *pm3_reg_base;
 
 #define WRITE_REG(offset,val)				\
-    *(volatile unsigned long *)(((unsigned char *)(pm3_reg_base)) + offset) = (val)
+    *(volatile unsigned long *)(((unsigned char *)(pm3_reg_base)) + (offset)) = (val)
 	
 #define READ_REG(offset)					\
-    *(volatile unsigned long *)(((unsigned char *)(pm3_reg_base)) + offset)
+    *(volatile unsigned long *)(((unsigned char *)(pm3_reg_base)) + (offset))
 
 #define UPDATE_SET_REG(offset,val)				\
     {								\
@@ -1094,8 +1094,8 @@ do{						\
 
 #define RAMDAC_SET_INDEX(index)					\
 {								\
-    SLOW_WRITE_REG (PM3RD_IndexHigh,(index>>8)&0xff);		\
-    SLOW_WRITE_REG (PM3RD_IndexLow,index&0xff);			\
+    SLOW_WRITE_REG (PM3RD_IndexHigh,((index)>>8)&0xff);		\
+    SLOW_WRITE_REG (PM3RD_IndexLow,(index)&0xff);			\
 }
 
 #define RAMDAC_SET_REG(index, data)				\