Libc-498.tar.gz

[apple/libc.git] / include / assert.h

diff --git a/include/assert.h b/include/assert.h
index a9c9b5539c84f828a2a74e06b988b977273519d0..1bfea51474a792dac600c0e587a9f4fb5c73af46 100644 (file)
--- a/include/assert.h
+++ b/include/assert.h
@@ -68,7 +68,7 @@ __END_DECLS
 #define assert(e)  \
     ((void) ((e) ? 0 : __assert (#e, __FILE__, __LINE__)))
 #define __assert(e, file, line) \
 #define assert(e)  \
     ((void) ((e) ? 0 : __assert (#e, __FILE__, __LINE__)))
 #define __assert(e, file, line) \

-    ((void)printf ("%s:%u: failed assertion `%s'\n", file, line, e), abort(), 0)
+    ((void)printf ("%s:%u: failed assertion `%s'\n", file, line, e), abort())

 
 #else /* __GNUC__ */
 
 
 #else /* __GNUC__ */
 


@@ -78,14 +78,14 @@ void __eprintf(const char *, const char *, unsigned, const char *) __dead2;
 __END_DECLS
 
 #define __assert(e, file, line) \
 __END_DECLS
 
 #define __assert(e, file, line) \

-    (__eprintf ("%s:%u: failed assertion `%s'\n", file, line, e), 0)
+    __eprintf ("%s:%u: failed assertion `%s'\n", file, line, e)

 
 #if __DARWIN_UNIX03
 #define        assert(e) \
     (__builtin_expect(!(e), 0) ? __assert_rtn(__func__, __FILE__, __LINE__, #e) : (void)0)
 #else /* !__DARWIN_UNIX03 */
 #define assert(e)  \
 
 #if __DARWIN_UNIX03
 #define        assert(e) \
     (__builtin_expect(!(e), 0) ? __assert_rtn(__func__, __FILE__, __LINE__, #e) : (void)0)
 #else /* !__DARWIN_UNIX03 */
 #define assert(e)  \

-    ((void) (__builtin_expect(!(e), 0) ? __assert (#e, __FILE__, __LINE__) : 0))
+    (__builtin_expect(!(e), 0) ? __assert (#e, __FILE__, __LINE__) : (void)0)

 #endif /* __DARWIN_UNIX03 */
 
 #endif /* __GNUC__ */
 #endif /* __DARWIN_UNIX03 */
 
 #endif /* __GNUC__ */