* NEWS: Added 2.2.6 text from 2.2 branch version.

3 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 454dd5a..cd6fb77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2002-08-28  Roland McGrath  <roland@redhat.com>
 
+	* NEWS: Added 2.2.6 text from 2.2 branch version.
+
 	* time/strptime.c (strptime_internal): Remove spurious const.
 
 	* locale/lc-time.c (_nl_init_era_entries, _nl_get_era_entry,
diff --git a/NEWS b/NEWS
index 8103f69..65ec4e5 100644
--- a/NEWS
+++ b/NEWS
@@ -51,6 +51,14 @@ Version 2.3
 * Startup times are significantly reduced by not using exported functions
   inside the library itself.  Changes by Jakub Jelinek, Roland McGrath,
   and Ulrich Drepper.
+o
+Version 2.2.6
+
+* The Hurd now uses the GNU libio implementation of stdio rather than the
+  old GNU stdio implementation, and uses a new ABI (libc.so.0.3).
+
+* The Hurd on x86 now has the `ioperm' function and <sys/io.h> header file
+  with the same behavior as the Linux system call of the same name.
 
 Version 2.2.5
 
@@ -67,8 +75,8 @@ Version 2.2.5
 * libc functions using I/O streams now can handle wide-oriented streams
   as well.
 
-* optimizations in the dynamic linker.  binaries created by recent binutils
-  versions start up quicker due to reduced time spend on relocations.
+* optimizations in the dynamic linker.  Binaries created by recent binutils
+  versions start up quicker due to reduced time spent on relocations.
 
 * Support for use of gcc3 added by Jakub Jelinek and HJ Lu.
 
@@ -1367,7 +1375,7 @@ Version 1.04
 ----------------------------------------------------------------------
 Copyright information:
 
-Copyright (C) 1992-1999, 2000 Free Software Foundation, Inc.
+Copyright (C) 1992-1999,2000,01,02 Free Software Foundation, Inc.
 
    Permission is granted to anyone to make or distribute verbatim copies
    of this document as received, in any medium, provided that the
diff --git a/linuxthreads/sysdeps/pthread/timer_routines.c b/linuxthreads/sysdeps/pthread/timer_routines.c
index 86fae2a..b88c5e0 100644
--- a/linuxthreads/sysdeps/pthread/timer_routines.c
+++ b/linuxthreads/sysdeps/pthread/timer_routines.c
@@ -490,7 +490,7 @@ __timer_thread_start (struct thread_node *thread)
   thread->exists = 1;
 
   if (pthread_create (&thread->id, &thread->attr,
-		      (void (*) (void *)) thread_func, thread) != 0)
+		      (void *(*) (void *)) thread_func, thread) != 0)
     {
       thread->exists = 0;
       retval = -1;