From: Andreas Jaeger <aj@suse.de>
Date: Mon, 18 Mar 2002 18:38:55 +0000 (+0000)
Subject: Merge.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f924e48bc45ae9d4e73ba2194381ba1fea814c93;p=thirdparty%2Fglibc.git

Merge.
---

diff --git a/ChangeLog b/ChangeLog
index 42e0c35b53e..f902baf9ddb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-02-07  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/unix/sysv/linux/bits/stat.h: Undo last patch.
+
+2002-03-17  Andreas Jaeger  <aj@suse.de>
+
+        * libio/iofdopen.c (_IO_new_fdopen): Pass parameter of correct
+        type to _IO_setb.
+
 2002-03-17  Andreas Jaeger  <aj@suse.de>
 
 	* sysdeps/mips/fpu/fraiseexcpt.c (__feraiseexcept): Set cause bits.
@@ -5,7 +14,7 @@
 	* sysdeps/mips/fpu/fgetexcptflg.c (__fegetexceptflag): Add comment.
 
 	* sysdeps/mips/fpu/fclrexcpt.c (__feclearexcept): Clear also cause
-	bits.	
+	bits.
 
 	* sysdeps/mips/fpu/fenv_libc.h (CAUSE_MASK): New.
 	(CAUSE_SHIFT): New.