Merge branch 'assert-duke32' into 'master'

Fix assert when used as an expression

See merge request redox-os/relibc!172

include/bits/assert.h

@@ -2,11 +2,10 @@
 #define _BITS_ASSERT_H
 
 #ifdef NDEBUG
-# define assert(cond)
+# define assert(cond) (void) 0
 #else
-# define assert(cond) if (!(cond)) { \
-    __assert(__func__, __FILE__, __LINE__, #cond); \
-  }
+# define assert(cond) \
+  ((void)((cond) || (__assert(__func__, __FILE__, __LINE__, #cond), 0)))
 #endif
 
 #endif

tests/assert.c

@@ -5,9 +5,12 @@
 int main() {
     assert(1 == 1);
     assert(1 + 1 == 2);
-
     puts("yay!");
 
+    if (assert(0 == 0), 1) {
+        puts("groovy!");
+    }
+
     //This fails, but I can't test it because that'd
     //make the test fail lol
     //assert(42 == 1337);

tests/expected/assert.stdout

@@ -1 +1,2 @@
 yay!
+groovy!