--- a/packages/compat/posix/current/ChangeLog
+++ b/packages/compat/posix/current/ChangeLog
@@ -1,3 +1,17 @@
+2001-02-14  Jonathan Larmour  <jlarmour@redhat.com>
+
+	* include/pthread.h: Remove pthread_canceled() and
+	pthread_testcancel_unlock().
+	
+	* src/pthread.cxx: Ditto.
+	(pthread_join): Restructure to have function exit only at function end
+	(pthread_cond_timedwait): Check for timeouts and return ETIMEDOUT
+
+	* src/signal.cxx (sigtimedwait): Restructure cancellation testing
+
+	* src/time.cxx (nanosleep): test for cancellation at the end of the
+	function to keep Nick happy ;).
+
 2001-02-11  Jonathan Larmour  <jlarmour@redhat.com>
 
 	* include/pthread.h: Add new pthread_testcancel_unlock and
@@ -634,3 +648,26 @@ 2000-03-24  Nick Garnett  <nickg@cygnus.
 	ready. Much work is still needed to make them so. Watch this
 	space.
 
+####COPYRIGHTBEGIN####
+                                                                          
+ -------------------------------------------                              
+ The contents of this file are subject to the Red Hat eCos Public License 
+ Version 1.1 (the "License"); you may not use this file except in         
+ compliance with the License.  You may obtain a copy of the License at    
+ http://www.redhat.com/                                                   
+                                                                          
+ Software distributed under the License is distributed on an "AS IS"      
+ basis, WITHOUT WARRANTY OF ANY KIND, either express or implied.  See the 
+ License for the specific language governing rights and limitations under 
+ the License.                                                             
+                                                                          
+ The Original Code is eCos - Embedded Configurable Operating System,      
+ released September 30, 1998.                                             
+                                                                          
+ The Initial Developer of the Original Code is Red Hat.                   
+ Portions created by Red Hat are                                          
+ Copyright (C) 2000, 2001 Red Hat, Inc.                             
+ All Rights Reserved.                                                     
+ -------------------------------------------                              
+                                                                          
+####COPYRIGHTEND####