From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 16 Feb 2007 07:58:29 +0000 (+0000)
Subject: [BZ #3991]
X-Git-Tag: cvs/fedora-glibc-20070221T1011~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3715c05d7834a6e755c293d3d9274bd0b71d4df;p=thirdparty%2Fglibc.git

[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 d190358ff93..30071bafb56 100644
--- 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 7c8ae4845db..841f435973a 100644
--- 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__'