diff options
Diffstat (limited to 'assert')
| -rw-r--r-- | assert/assert-perr.c | 10 | ||||
| -rw-r--r-- | assert/assert.c | 11 | ||||
| -rw-r--r-- | assert/assert.h | 18 |
3 files changed, 24 insertions, 15 deletions
diff --git a/assert/assert-perr.c b/assert/assert-perr.c index dd54246360..3017c9fd9c 100644 --- a/assert/assert-perr.c +++ b/assert/assert-perr.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1994-1998,2001,2002,2005 Free Software Foundation, Inc. +/* Copyright (C) 1994-1998,2001,2002 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 @@ -61,7 +61,13 @@ __assert_perror_fail (int errnum, __strerror_r (errnum, errbuf, sizeof errbuf)) >= 0) { /* Print the message. */ - (void) __fxprintf (NULL, "%s", buf); +#ifdef USE_IN_LIBIO + if (_IO_fwide (stderr, 0) > 0) + (void) __fwprintf (stderr, L"%s", buf); + else +#endif + (void) fputs (buf, stderr); + (void) fflush (stderr); /* We have to free the buffer since the appplication might catch the diff --git a/assert/assert.c b/assert/assert.c index 0ef4ca62e4..20c86eba52 100644 --- a/assert/assert.c +++ b/assert/assert.c @@ -1,5 +1,4 @@ -/* Copyright (C) 1991,1994-1996,1998,2001,2002,2005 - Free Software Foundation, Inc. +/* Copyright (C) 1991,1994-1996,1998,2001,2002 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 @@ -61,7 +60,13 @@ __assert_fail (const char *assertion, const char *file, unsigned int line, assertion) >= 0) { /* Print the message. */ - (void) __fxprintf (NULL, "%s", buf); +#ifdef USE_IN_LIBIO + if (_IO_fwide (stderr, 0) > 0) + (void) __fwprintf (stderr, L"%s", buf); + else +#endif + (void) fputs (buf, stderr); + (void) fflush (stderr); /* We have to free the buffer since the application might catch the diff --git a/assert/assert.h b/assert/assert.h index 7c8ae4845d..2f83146274 100644 --- a/assert/assert.h +++ b/assert/assert.h @@ -84,18 +84,16 @@ extern void __assert (const char *__assertion, const char *__file, int __line) __END_DECLS -# define assert(expr) \ - ((expr) \ - ? __ASSERT_VOID_CAST (0) \ - : (__assert_fail (__STRING(expr), __FILE__, __LINE__, __ASSERT_FUNCTION), \ - __ASSERT_VOID_CAST (0))) +# define assert(expr) \ + (__ASSERT_VOID_CAST ((expr) ? 0 : \ + (__assert_fail (__STRING(expr), __FILE__, __LINE__, \ + __ASSERT_FUNCTION), 0))) # ifdef __USE_GNU -# define assert_perror(errnum) \ - (!(errnum) \ - ? __ASSERT_VOID_CAST (0) \ - : (__assert_perror_fail ((errnum), __FILE__, __LINE__, __ASSERT_FUNCTION), \ - __ASSERT_VOID_CAST (0))) +# define assert_perror(errnum) \ + (__ASSERT_VOID_CAST (!(errnum) ? 0 : \ + (__assert_perror_fail ((errnum), __FILE__, __LINE__, \ + __ASSERT_FUNCTION), 0))) # endif /* Version 2.4 and later of GCC define a magical variable `__PRETTY_FUNCTION__' |