From ca516fd8e648681b1e729c0191604b10106f3f44 Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Mon, 23 Sep 2013 13:03:56 +0000
Subject: git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6314
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/rt/include/chdebug.h | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'os/rt/include')

diff --git a/os/rt/include/chdebug.h b/os/rt/include/chdebug.h
index 0fdc865eb..63440e4ee 100644
--- a/os/rt/include/chdebug.h
+++ b/os/rt/include/chdebug.h
@@ -121,8 +121,6 @@ typedef struct {
 /* Module macros.                                                            */
 /*===========================================================================*/
 
-#define __QUOTE_THIS(p) #p
-
 #if CH_DBG_SYSTEM_STATE_CHECK
 #define _dbg_enter_lock() (ch.dbg_lock_cnt = 1)
 #define _dbg_leave_lock() (ch.dbg_lock_cnt = 0)
@@ -170,12 +168,12 @@ typedef struct {
 #if !defined(chDbgCheck)
 #define chDbgCheck(c) {                                                     \
   if (!(c))                                                                 \
-    chSysHalt("C:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__));     \
+    chSysHalt(__func__);                                                \
 }
 #endif /* !defined(chDbgCheck) */
 
 #else /* !CH_DBG_ENABLE_CHECKS */
-#define chDbgCheck(c) /*{(void)(c);}*/
+#define chDbgCheck(c) {if (0) (void)(c);}
 #endif /* !CH_DBG_ENABLE_CHECKS */
 
 #if CH_DBG_ENABLE_ASSERTS || defined(__DOXYGEN__)
@@ -196,11 +194,11 @@ typedef struct {
 #if !defined(chDbgAssert)
 #define chDbgAssert(c, r) {                                                 \
   if (!(c))                                                                 \
-    chSysHalt("A:"__QUOTE_THIS(__FUNCTION__)":"__QUOTE_THIS(__LINE__));     \
+    chSysHalt(__func__);                                                \
 }
 #endif /* !defined(chDbgAssert) */
 #else /* !CH_DBG_ENABLE_ASSERTS */
-#define chDbgAssert(c, r) /*{(void)(c);}*/
+#define chDbgAssert(c, r) {if (0) (void)(c);}
 #endif /* !CH_DBG_ENABLE_ASSERTS */
 /** @} */
 
-- 
cgit v1.2.3