From: Pavel Charvat <pavel.charvat@netcentrum.cz>
Date: Wed, 7 Mar 2007 15:24:22 +0000 (+0100)
Subject: ASSERT if now an expression
X-Git-Tag: holmes-import~506^2~101
X-Git-Url: http://mj.ucw.cz/gitweb/?a=commitdiff_plain;h=92b147a2908219112dee09867170ba8b82fb9433;p=libucw.git

ASSERT if now an expression
---

diff --git a/lib/lib.h b/lib/lib.h
index c6b558d1..e159518b 100644
--- a/lib/lib.h
+++ b/lib/lib.h
@@ -111,9 +111,9 @@ void assert_failed(char *assertion, char *file, int line) NONRET;
 void assert_failed_noinfo(void) NONRET;
 
 #ifdef DEBUG_ASSERTS
-#define ASSERT(x) do { if (unlikely(!(x))) assert_failed(#x, __FILE__, __LINE__); } while(0)
+#define ASSERT(x) ({ if (unlikely(!(x))) assert_failed(#x, __FILE__, __LINE__); 1; })
 #else
-#define ASSERT(x) do { if (__builtin_constant_p(x) && !(x)) assert_failed_noinfo(); } while(0)
+#define ASSERT(x) ({ if (__builtin_constant_p(x) && !(x)) assert_failed_noinfo(); 1; })
 #endif
 
 #define COMPILE_ASSERT(name,x) typedef char _COMPILE_ASSERT_##name[!!(x)-1]