diff options
| author | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-23 13:03:56 +0000 |
|---|---|---|
| committer | gdisirio <gdisirio@35acf78f-673a-0410-8e92-d51de3d6d3f4> | 2013-09-23 13:03:56 +0000 |
| commit | ca516fd8e648681b1e729c0191604b10106f3f44 (patch) | |
| tree | fc8947ccf6e83104903d5a3361b6659d112ae755 /os/nil | |
| parent | 3d30779fd790358d280b4b61b5d1aaa0e697b554 (diff) | |
| download | ChibiOS-ca516fd8e648681b1e729c0191604b10106f3f44.tar.gz ChibiOS-ca516fd8e648681b1e729c0191604b10106f3f44.tar.bz2 ChibiOS-ca516fd8e648681b1e729c0191604b10106f3f44.zip | |
git-svn-id: svn://svn.code.sf.net/p/chibios/svn/branches/kernel_3_dev@6314 35acf78f-673a-0410-8e92-d51de3d6d3f4
Diffstat (limited to 'os/nil')
| -rw-r--r-- | os/nil/include/nil.h | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/os/nil/include/nil.h b/os/nil/include/nil.h index c6994dfe1..9d5218198 100644 --- a/os/nil/include/nil.h +++ b/os/nil/include/nil.h @@ -360,11 +360,6 @@ typedef struct { /*===========================================================================*/
/**
- * @brief String quotation macro.
- */
-#define __CH_QUOTE(p) #p
-
-/**
* @name Threads tables definition macros
* @{
*/
@@ -742,11 +737,11 @@ typedef struct { #if !defined(chDbgAssert)
#define chDbgAssert(c, r) { \
if (!(c)) \
- chSysHalt("A:"__CH_QUOTE(__FUNCTION__)":"__CH_QUOTE(__LINE__)); \
+ chSysHalt(__func__); \
}
#endif /* !defined(chDbgAssert) */
#else /* !NIL_CFG_ENABLE_ASSERTS */
-#define chDbgAssert(c, r) /*{(void)(c);}*/
+#define chDbgAssert(c, r) {if (0) (void)(c);}
#endif /* !NIL_CFG_ENABLE_ASSERTS */
/** @} */
|