diff --git a/mp_msg.h b/mp_msg.h
index 86e010ba16..ef37710599 100644
--- a/mp_msg.h
+++ b/mp_msg.h
@@ -142,21 +142,17 @@ void mp_msg_va(int mod, int lev, const char *format, va_list va);
 #ifdef __GNUC__
 void mp_msg(int mod, int lev, const char *format, ... ) __attribute__ ((format (printf, 3, 4)));
 void mp_tmsg(int mod, int lev, const char *format, ... ) __attribute__ ((format (printf, 3, 4)));
-#   ifdef MP_DEBUG
-#      define mp_dbg(mod,lev, args... ) mp_msg(mod, lev, ## args )
-#   else
-#      define mp_dbg(mod,lev, args... ) /* only useful for developers */
-#   endif
 #else // not GNU C
 void mp_msg(int mod, int lev, const char *format, ... );
 void mp_tmsg(int mod, int lev, const char *format, ...)
-#   ifdef MP_DEBUG
-#      define mp_dbg(mod,lev, ... ) mp_msg(mod, lev, __VA_ARGS__)
-#   else
-#      define mp_dbg(mod,lev, ... ) /* only useful for developers */
-#   endif
 #endif /* __GNUC__ */
 
+#ifdef MP_DEBUG
+#define mp_dbg(mod,lev, ... ) mp_msg(mod, lev, __VA_ARGS__)
+#else
+#define mp_dbg(mod,lev, ... ) /* only useful for developers */
+#endif
+
 const char* filename_recode(const char* filename);
 
 #endif /* MPLAYER_MP_MSG_H */