* assert/assert.h (assert): Simplify.
	(assert_perror): Likewise.
	Patch by Israel G. Lugo <ilugo@bridonsecurity.com>.
This commit is contained in:
Ulrich Drepper 2007-02-16 07:58:29 +00:00
parent 6eea8e0d48
commit b3715c05d7
2 changed files with 9 additions and 5 deletions

View File

@ -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.

View File

@ -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__'