From 0ecb606cb6cf65de1d9fc8a919bceb4be476c602 Mon Sep 17 00:00:00 2001
From: Jakub Jelinek <jakub@redhat.com>
Date: Thu, 12 Jul 2007 18:26:36 +0000
Subject: 2.5-18.1

---
 assert/assert-perr.c | 10 ++--------
 assert/assert.c      | 11 +++--------
 assert/assert.h      | 18 ++++++++++--------
 3 files changed, 15 insertions(+), 24 deletions(-)

(limited to 'assert')

diff --git a/assert/assert-perr.c b/assert/assert-perr.c
index 3017c9fd9c..dd54246360 100644
--- a/assert/assert-perr.c
+++ b/assert/assert-perr.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1994-1998,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1994-1998,2001,2002,2005 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,13 +61,7 @@ __assert_perror_fail (int errnum,
 		  __strerror_r (errnum, errbuf, sizeof errbuf)) >= 0)
     {
       /* Print the message.  */
-#ifdef USE_IN_LIBIO
-      if (_IO_fwide (stderr, 0) > 0)
-	(void) __fwprintf (stderr, L"%s", buf);
-      else
-#endif
-	(void) fputs (buf, stderr);
-
+      (void) __fxprintf (NULL, "%s", buf);
       (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 20c86eba52..0ef4ca62e4 100644
--- a/assert/assert.c
+++ b/assert/assert.c
@@ -1,4 +1,5 @@
-/* Copyright (C) 1991,1994-1996,1998,2001,2002 Free Software Foundation, Inc.
+/* Copyright (C) 1991,1994-1996,1998,2001,2002,2005
+   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
@@ -60,13 +61,7 @@ __assert_fail (const char *assertion, const char *file, unsigned int line,
 		  assertion) >= 0)
     {
       /* Print the message.  */
-#ifdef USE_IN_LIBIO
-      if (_IO_fwide (stderr, 0) > 0)
-	(void) __fwprintf (stderr, L"%s", buf);
-      else
-#endif
-	(void) fputs (buf, stderr);
-
+      (void) __fxprintf (NULL, "%s", buf);
       (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 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__'
-- 
cgit 1.4.1