Merge pull request #9136 from jcarrano/fix-assert

core: make assert() an expression.
RIOT-OS · May 15, 2018 · 8fd0136 · 8fd0136
2 parents d6c6359 + 09d1b2e
commit 8fd0136
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/core/include/assert.h b/core/include/assert.h
@@ -101,10 +101,7 @@ NORETURN void _assert_failure(const char *file, unsigned line);
  *
  * @see http://pubs.opengroup.org/onlinepubs/9699919799/functions/assert.html
  */
-#define assert(cond) \
-    if (!(cond)) { \
-        _assert_failure(RIOT_FILE_RELATIVE, __LINE__); \
-    }
+#define assert(cond) ((cond) ? (void)0 :  _assert_failure(RIOT_FILE_RELATIVE, __LINE__))
 #else
 #define assert(cond) ((cond) ? (void)0 : core_panic(PANIC_ASSERT_FAIL, assert_crash_message))
 #endif