From c0372b43443df18547157d289542db47bdd9599c Mon Sep 17 00:00:00 2001
From: gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4>
Date: Mon, 23 Sep 2013 19:16:06 +0000
Subject: [PATCH] git-svn-id:
 svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6316
 35acf78f-673a-0410-8e92-d51de3d6d3f4

---
 os/nil/include/nil.h    |  8 ++------
 os/rt/include/chdebug.h | 17 ++++-------------
 2 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h
index 9d5218198..371a090c1 100644
--- a/os/nil/include/nil.h
+++ b/os/nil/include/nil.h
@@ -719,7 +719,6 @@ typedef struct {
 #define chVTGetSystemTimeX() port_timer_get_time()
 #endif
 
-#if NIL_CFG_ENABLE_ASSERTS || defined(__DOXYGEN__)
 /**
  * @brief   Condition assertion.
  * @details If the condition check fails then the kernel panics with a
@@ -736,13 +735,10 @@ typedef struct {
  */
 #if !defined(chDbgAssert)
 #define chDbgAssert(c, r) {                                                 \
-  if (!(c))                                                                 \
-    chSysHalt(__func__);                                                \
+  if (NIL_CFG_ENABLE_ASSERTS && !(c))                                       \
+    chSysHalt(__func__);                                                    \
 }
 #endif /* !defined(chDbgAssert) */
-#else /* !NIL_CFG_ENABLE_ASSERTS */
-#define chDbgAssert(c, r) {if (0) (void)(c);}
-#endif /* !NIL_CFG_ENABLE_ASSERTS */
 /** @} */
 
 /*===========================================================================*/
diff --git a/os/rt/include/chdebug.h b/os/rt/include/chdebug.h
index 63440e4ee..98cb24e37 100644
--- a/os/rt/include/chdebug.h
+++ b/os/rt/include/chdebug.h
@@ -154,7 +154,6 @@ typedef struct {
  * @name    Macro Functions
  * @{
  */
-#if CH_DBG_ENABLE_CHECKS || defined(__DOXYGEN__)
 /**
  * @brief   Function parameters check.
  * @details If the condition check fails then the kernel panics and halts.
@@ -167,16 +166,11 @@ typedef struct {
  */
 #if !defined(chDbgCheck)
 #define chDbgCheck(c) {                                                     \
-  if (!(c))                                                                 \
-    chSysHalt(__func__);                                                \
+  if (CH_DBG_ENABLE_CHECKS && !(c))                                         \
+    chSysHalt(__func__);                                                    \
 }
 #endif /* !defined(chDbgCheck) */
 
-#else /* !CH_DBG_ENABLE_CHECKS */
-#define chDbgCheck(c) {if (0) (void)(c);}
-#endif /* !CH_DBG_ENABLE_CHECKS */
-
-#if CH_DBG_ENABLE_ASSERTS || defined(__DOXYGEN__)
 /**
  * @brief   Condition assertion.
  * @details If the condition check fails then the kernel panics with a
@@ -193,13 +187,10 @@ typedef struct {
  */
 #if !defined(chDbgAssert)
 #define chDbgAssert(c, r) {                                                 \
-  if (!(c))                                                                 \
-    chSysHalt(__func__);                                                \
+  if (CH_DBG_ENABLE_ASSERTS && !(c))                                        \
+    chSysHalt(__func__);                                                    \
 }
 #endif /* !defined(chDbgAssert) */
-#else /* !CH_DBG_ENABLE_ASSERTS */
-#define chDbgAssert(c, r) {if (0) (void)(c);}
-#endif /* !CH_DBG_ENABLE_ASSERTS */
 /** @} */
 
 /*===========================================================================*/