From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 3 Aug 2006 08:30:09 +0000 (+0000)
Subject: Move cast to void inside ?: to quiet gcc.
X-Git-Tag: cvs/fedora-glibc-20060807T1859~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=389935d71fad6729a7a6dc5e95acf54096691b05;p=thirdparty%2Fglibc.git

Move cast to void inside ?: to quiet gcc.
---

diff --git a/assert/assert.h b/assert/assert.h
index 2f83146274a..7c8ae4845db 100644
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -84,16 +84,18 @@ extern void __assert (const char *__assertion, const char *__file, int __line)
 
 __END_DECLS
 
-# define assert(expr) \
-  (__ASSERT_VOID_CAST ((expr) ? 0 :					      \
-		       (__assert_fail (__STRING(expr), __FILE__, __LINE__,    \
-				       __ASSERT_FUNCTION), 0)))
+# define assert(expr)							\
+  ((expr)								\
+   ? __ASSERT_VOID_CAST (0)						\
+   : (__assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION), \
+      __ASSERT_VOID_CAST (0)))
 
 # ifdef	__USE_GNU
-#  define assert_perror(errnum) \
-  (__ASSERT_VOID_CAST (!(errnum) ? 0 :					      \
-		       (__assert_perror_fail ((errnum), __FILE__, __LINE__,   \
-					      __ASSERT_FUNCTION), 0)))
+#  define assert_perror(errnum)						\
+  (!(errnum)								\
+   ? __ASSERT_VOID_CAST (0)						\
+   : (__assert_perror_fail ((errnum), __FILE__, __LINE__, __ASSERT_FUNCTION), \
+      __ASSERT_VOID_CAST (0)))
 # endif
 
 /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'