From 49c3641b6e2d742638ddcbc4401376cb312af3e9 Mon Sep 17 00:00:00 2001
From: Bernhard Miklautz <bmiklautz@thinstuff.at>
Date: Mon, 14 Jan 2013 11:47:24 +0100
Subject: [PATCH] utils/debug: renamed DEBUG to DEBUG_MSG

---
 client/X11/xfreerdp.c         | 2 +-
 include/freerdp/utils/debug.h | 4 ++--
 libfreerdp/utils/msusb.c      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/client/X11/xfreerdp.c b/client/X11/xfreerdp.c
index a68c84d0e..3d20bc6b8 100644
--- a/client/X11/xfreerdp.c
+++ b/client/X11/xfreerdp.c
@@ -665,7 +665,7 @@ UINT32 xf_detect_cpu()
 
 	if (edx & (1<<26)) 
 	{
-		DEBUG("SSE2 detected");
+		DEBUG_MSG("SSE2 detected");
 		cpu_opt |= CPU_SSE2;
 	}
 
diff --git a/include/freerdp/utils/debug.h b/include/freerdp/utils/debug.h
index 5e460bde3..1e51c5428 100644
--- a/include/freerdp/utils/debug.h
+++ b/include/freerdp/utils/debug.h
@@ -28,9 +28,9 @@
 #define DEBUG_WARN(fmt, ...) DEBUG_PRINT("Warning %s (%d): ", fmt, ## __VA_ARGS__)
 
 #ifdef WITH_DEBUG
-#define DEBUG(fmt, ...)	DEBUG_PRINT("DBG %s (%d): ", fmt, ## __VA_ARGS__)
+#define DEBUG_MSG(fmt, ...)	DEBUG_PRINT("DBG %s (%d): ", fmt, ## __VA_ARGS__)
 #else
-#define DEBUG(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
+#define DEBUG_MSG(fmt, ...) DEBUG_NULL(fmt, ## __VA_ARGS__)
 #endif
 
 #endif /* FREERDP_UTILS_DEBUG_H */
diff --git a/libfreerdp/utils/msusb.c b/libfreerdp/utils/msusb.c
index 27f60c717..9c6ad9132 100644
--- a/libfreerdp/utils/msusb.c
+++ b/libfreerdp/utils/msusb.c
@@ -285,7 +285,7 @@ MSUSB_CONFIG_DESCRIPTOR* msusb_msconfig_read(BYTE* data, UINT32 data_size, UINT3
 
 	if (lenConfiguration != 0x9 || typeConfiguration != 0x2)
 	{
-		DEBUG("%s: len and type must be 0x9 and 0x2 , but it is 0x%x and 0x%x", 
+		DEBUG_MSG("%s: len and type must be 0x9 and 0x2 , but it is 0x%x and 0x%x", 
 			lenConfiguration, typeConfiguration);
 	}