From 23486f48a5034b3a25be6ced6cdba9a86131e1f0 Mon Sep 17 00:00:00 2001 From: mosu 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 --- mp_msg.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'mp_msg.h') 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, ... ) -- cgit v1.2.3