2 files changed, 19 insertions, 1 deletions
diff --git a/src/main.c b/src/main.c
index 2ace29740..abe60bf15 100644
--- a/src/main.c
+++ b/src/main.c
@@ -133,6 +133,24 @@ catch_sigint( int sig )
   exit(EXIT_SUCCESS);
 }
 
+#ifdef DEBUG
+void 
+D(char *format, ...)
+{
+  if( options.debug )
+    {
+      gchar *msg;
+      va_list ap;
+  
+      va_start(ap,format);
+      msg = g_strdup_vprintf(format,ap);
+      va_end(ap);
+      fprintf(stderr, "%s", msg);
+      g_free(msg);
+    }
+}
+#endif
+
 int 
 main(int argc, const char *argv[])
 {
diff --git a/src/ncmpc.h b/src/ncmpc.h
index 029498f03..4118456a1 100644
--- a/src/ncmpc.h
+++ b/src/ncmpc.h
@@ -6,7 +6,7 @@
 #endif
 
 #ifdef DEBUG
-#define D(format, args...) fprintf(stderr, format,  ##args)
+void D(char *format, ...);
 #else
 #define D(...)
 #endif