diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-24 13:00:46 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-24 13:00:46 +0000 |
| commit | 191a1672e2f44f9d28d0bbf9d56ed4a22efec0a1 (patch) | |
| tree | 912ade105a987295537b9166372e1b461f4aac73 /os | |
| parent | c0372b43443df18547157d289542db47bdd9599c (diff) | |
| download | ChibiOS-191a1672e2f44f9d28d0bbf9d56ed4a22efec0a1.tar.gz ChibiOS-191a1672e2f44f9d28d0bbf9d56ed4a22efec0a1.tar.bz2 ChibiOS-191a1672e2f44f9d28d0bbf9d56ed4a22efec0a1.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6317 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os')
| -rw-r--r-- | os/nil/include/nil.h | 6 | ||||
| -rw-r--r-- | os/rt/include/chdebug.h | 8 |
2 files changed, 7 insertions, 7 deletions
diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h index 371a090c1..480baa0e6 100644 --- a/os/nil/include/nil.h +++ b/os/nil/include/nil.h @@ -724,7 +724,7 @@ typedef struct { * @details If the condition check fails then the kernel panics with a
* message and halts.
* @note The condition is tested only if the @p NIL_CFG_ENABLE_ASSERTS
- * switch is specified in @p chconf.h else the macro does nothing.
+ * switch is specified in @p nilconf.h else the macro does nothing.
* @note The remark string is not currently used except for putting a
* comment in the code about the assertion.
*
@@ -734,10 +734,10 @@ typedef struct { * @api
*/
#if !defined(chDbgAssert)
-#define chDbgAssert(c, r) { \
+#define chDbgAssert(c, r) do { \
if (NIL_CFG_ENABLE_ASSERTS && !(c)) \
chSysHalt(__func__); \
-}
+} while (0)
#endif /* !defined(chDbgAssert) */
/** @} */
diff --git a/os/rt/include/chdebug.h b/os/rt/include/chdebug.h index 98cb24e37..6ae948bc3 100644 --- a/os/rt/include/chdebug.h +++ b/os/rt/include/chdebug.h @@ -165,10 +165,10 @@ typedef struct { * @api
*/
#if !defined(chDbgCheck)
-#define chDbgCheck(c) { \
+#define chDbgCheck(c) do { \
if (CH_DBG_ENABLE_CHECKS && !(c)) \
chSysHalt(__func__); \
-}
+} while (0)
#endif /* !defined(chDbgCheck) */
/**
@@ -186,10 +186,10 @@ typedef struct { * @api
*/
#if !defined(chDbgAssert)
-#define chDbgAssert(c, r) { \
+#define chDbgAssert(c, r) do { \
if (CH_DBG_ENABLE_ASSERTS && !(c)) \
chSysHalt(__func__); \
-}
+} while (0)
#endif /* !defined(chDbgAssert) */
/** @} */
|