summaryrefslogtreecommitdiff
path: root/assert
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@redhat.com>2006-08-03 08:30:09 +0000
committerUlrich Drepper <drepper@redhat.com>2006-08-03 08:30:09 +0000
commit389935d71fad6729a7a6dc5e95acf54096691b05 (patch)
tree596bf1075c0e82bc2e0b96ecbe4666698667c6ae /assert
parentf1762c0c4b3ba91073f82da02a16d8ee29ed7444 (diff)
downloadglibc-389935d71fad6729a7a6dc5e95acf54096691b05.tar.gz
Move cast to void inside ?: to quiet gcc.
Diffstat (limited to 'assert')
-rw-r--r--assert/assert.h18
1 files changed, 10 insertions, 8 deletions
diff --git a/assert/assert.h b/assert/assert.h
index 2f83146274..7c8ae4845d 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__'