diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2006-08-07 19:28:26 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2006-08-07 19:28:26 +0000 |
| commit | 503d6a958581777473c31f73113d0fa6cff19b30 (patch) | |
| tree | c8526f0403ac272cba94213a3c5b10a369876d78 /assert | |
| parent | 98d2266156a49df5f93726c8f0b148bbdee41c9d (diff) | |
Updated to fedora-glibc-20060807T1859cvs/fedora-glibc-2_4_90-18
Diffstat (limited to 'assert')
| -rw-r--r-- | assert/assert.h | 18 |
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__' |