diff mp_msg.h @ 16618:bad73cd81b23

mp_msg cleanup.
author ods15
date Thu, 29 Sep 2005 05:21:12 +0000
parents 4a6b79a1ad52
children f84925bd74b1
line wrap: on
line diff
--- a/mp_msg.h	Wed Sep 28 21:49:40 2005 +0000
+++ b/mp_msg.h	Thu Sep 29 05:21:12 2005 +0000
@@ -114,26 +114,17 @@
 #endif
 
 #ifdef __GNUC__
-void mp_msg_c( int x, const char *format, ... ) __attribute__ ((format (printf, 2, 3)));
-#define mp_msg(mod,lev, args... ) mp_msg_c(((mod)<<8)|(lev), ## args )
+void mp_msg(int mod, int lev, const char *format, ... ) __attribute__ ((format (printf, 3, 4)));
+#else // not GNU C
+void mp_msg(int mod, int lev, const char *format, ... );
+#endif
 
 #ifdef MP_DEBUG
-#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
-void mp_msg_c( int x, const char *format, ... );
-#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(mod, lev, __VA_ARGS__)
 #else
 // these messages are only usefull for developers, disable them
 #define mp_dbg(mod,lev, ... ) 
 #endif
-#endif
 
 #endif
 #endif