diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-23 19:16:06 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-23 19:16:06 +0000 |
| commit | c0372b43443df18547157d289542db47bdd9599c (patch) | |
| tree | d851faaca03a8622153f23ccb5226ca6dbe0d3e7 /os/nil | |
| parent | 4c166f98c7ccb9bdc7e17d30786c326031bc9d89 (diff) | |
| download | ChibiOS-c0372b43443df18547157d289542db47bdd9599c.tar.gz ChibiOS-c0372b43443df18547157d289542db47bdd9599c.tar.bz2 ChibiOS-c0372b43443df18547157d289542db47bdd9599c.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6316 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/nil')
| -rw-r--r-- | os/nil/include/nil.h | 8 |
1 files changed, 2 insertions, 6 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 */
/** @} */
/*===========================================================================*/
|