From 63ed0e78ffb72a9f425928344355c2159830b5af Mon Sep 17 00:00:00 2001 From: rpj Date: Thu, 23 Jul 1998 17:12:12 +0000 Subject: Fri Jul 24 03:00:25 1998 Ross Johnson * attr.c (pthread_attr_destroy): Fix merge conflicts. (pthread_attr_getdetachstate): Fix merge conflicts. (pthread_attr_setdetachstate): Fix merge conflicts. * pthread.h: Fix merge conflicts. * sync.c (pthread_join): Fix merge conflicts. --- PROGRESS | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'PROGRESS') diff --git a/PROGRESS b/PROGRESS index 1613459..81ac529 100644 --- a/PROGRESS +++ b/PROGRESS @@ -1,4 +1,4 @@ -Last updated: $Date: 1998/07/23 16:00:12 $ +Last updated: $Date: 1998/07/23 17:12:12 $ Completion: 54 out of 61 functions [ 88%] @@ -38,7 +38,7 @@ no. name status 29 pthread_cond_timedwait * 30 pthread_cond_wait * 31 pthread_create * -32 pthread_detach +32 pthread_detach * 33 pthread_equal * 34 pthread_exit * 35 pthread_getschedparam * @@ -66,5 +66,5 @@ no. name status 57 pthread_setcanceltype * 58 pthread_setschedparam * 59 pthread_setspecific * -60 pthread_sigmask +60 pthread_sigmask 61 pthread_testcancel -- cgit v1.2.3