From 23486f48a5034b3a25be6ced6cdba9a86131e1f0 Mon Sep 17 00:00:00 2001
From: mosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Wed, 15 Jan 2003 11:16:33 +0000
Subject: 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
---
 libaf/af.h          | 4 ++--
 libaf/af_mp.h       | 2 +-
 libaf/af_resample.h | 4 ++--
 libaf/filter.h      | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

(limited to 'libaf')

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
-- 
cgit v1.2.3