[BZ #3991]

	* assert/assert.h (assert): Simplify.
	(assert_perror): Likewise.
	Patch by Israel G. Lugo <ilugo@bridonsecurity.com>.

diff --git a/ChangeLog b/ChangeLog
index d190358ff9389f53a8c7422d4f964101ef79945c..30071bafb56e28668c8cb5eb92c608cf4bb8cd9a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2007-02-15  Ulrich Drepper  <drepper@redhat.com>
 
+       [BZ #3991]
+       * assert/assert.h (assert): Simplify.
+       (assert_perror): Likewise.
+       Patch by Israel G. Lugo <ilugo@bridonsecurity.com>.
+
        * nscd/nscd_helper.c (open_socket): Don't send padding bytes from
        reqdata.
 

diff --git a/assert/assert.h b/assert/assert.h
index 7c8ae4845db8a80fe35d08f55217f110926213ce..841f435973aa831a55aacf03c5a3c534ba7763c4 100644 (file)
--- a/assert/assert.h
+++ b/assert/assert.h
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1992,1994-2001,2003,2004 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1992,1994-2001,2003,2004,2007
+   Free Software Foundation, Inc.
    This file is part of the GNU C Library.
 
    The GNU C Library is free software; you can redistribute it and/or
@@ -87,15 +88,13 @@ __END_DECLS
 # define assert(expr)                                                  \
   ((expr)                                                              \
    ? __ASSERT_VOID_CAST (0)                                            \
-   : (__assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION), \
-      __ASSERT_VOID_CAST (0)))
+   : __assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION))
 
 # ifdef        __USE_GNU
 #  define assert_perror(errnum)                                                \
   (!(errnum)                                                           \
    ? __ASSERT_VOID_CAST (0)                                            \
-   : (__assert_perror_fail ((errnum), __FILE__, __LINE__, __ASSERT_FUNCTION), \
-      __ASSERT_VOID_CAST (0)))
+   : __assert_perror_fail ((errnum), __FILE__, __LINE__, __ASSERT_FUNCTION))
 # endif
 
 /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__'