diff --git a/ChangeLog b/ChangeLog
index 9f43dba6cc..1f756dc4a4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-14  Ulrich Drepper  <drepper@redhat.com>
+
+	* stdio-common/perror.c (perror): Use _IO_fwide instead of fwide.
+
+	* libio/libio.h (_IO_fwide): Handle zero as second parameter more
+	efficiently in macro.
+
 2001-08-14  Jakub Jelinek  <jakub@redhat.com>
 
 	* resolv/nss_dns/dns-host.c (RESOLVSORT): Define.
diff --git a/libio/libio.h b/libio/libio.h
index 880edaf289..1bd31894e8 100644
--- a/libio/libio.h
+++ b/libio/libio.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,92,93,94,95,97,98,99,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1995, 1997-2000, 2001 Free Software Foundation, Inc.
    This file is part of the GNU C Library.
    Written by Per Bothner <bothner@cygnus.com>.
 
@@ -495,6 +495,8 @@ weak_extern (_IO_stdin_used);
 	   (__fp)->_mode = -1;						      \
 	 __result = (__fp)->_mode;					      \
        }								      \
+     else if (__builtin_constant_p (__mode) && (__mode) == 0)		      \
+       __result = (__fp)->_mode;					      \
      else								      \
        __result = _IO_fwide (__fp, __result);				      \
      __result; })
diff --git a/stdio-common/perror.c b/stdio-common/perror.c
index 8ac8bc4280..c22be6daf2 100644
--- a/stdio-common/perror.c
+++ b/stdio-common/perror.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1991,1992,1993,1997,1998,2000 Free Software Foundation, Inc.
+/* Copyright (C) 1991-1993,1997,1998,2000,2001 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
@@ -40,7 +40,7 @@ perror (const char *s)
   errstring = __strerror_r (errnum, buf, sizeof buf);
 
 #ifdef USE_IN_LIBIO
-  if (fwide (stderr, 0) > 0)
+  if (_IO_fwide (stderr, 0) > 0)
     (void) fwprintf (stderr, L"%s%s%s\n", s, colon, errstring);
   else
 #endif