From 199d96f3e3f6077235be8e0bf9482d2a46e108c2 Mon Sep 17 00:00:00 2001 From: rpj Date: Thu, 7 Sep 2000 15:41:11 +0000 Subject: 2000-09-08 Ross Johnson * cancel.c (pthread_cancel): Must get "self" through calling pthread_self() which will ensure a POSIX thread struct is built for non-POSIX threads; return an error if this fails - Ollie Leahy (pthread_setcancelstate): Likewise. (pthread_setcanceltype): Likewise. * misc.c (ptw32_cancelable_wait): Likewise. * private.c (ptw32_tkAssocCreate): Remove unused #if 0 wrapped code. * pthread.h (ptw32_get_exception_services_code): Needed to be forward declared unconditionally. 2000-09-06 Ross Johnson * cancel.c (pthread_cancel): If called from the main thread "self" would be NULL; get "self" via pthread_self() instead of directly from TLS so that an implicit pthread object is created. * misc.c (pthread_equal): Strengthen test for NULLs. --- private.c | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'private.c') diff --git a/private.c b/private.c index 37cb910..0e94d5f 100644 --- a/private.c +++ b/private.c @@ -399,22 +399,10 @@ ptw32_tkAssocCreate (ThreadKeyAssoc ** assocP, goto FAIL0; } -#if 0 - - if ((result = pthread_mutex_init (&(assoc->lock), NULL)) != 0) - { - goto FAIL1; - } - -#else - /* * Initialise only when used for the first time. */ assoc->lock = PTHREAD_MUTEX_INITIALIZER; - -#endif - assoc->thread = thread; assoc->key = key; @@ -451,8 +439,6 @@ ptw32_tkAssocCreate (ThreadKeyAssoc ** assocP, */ FAIL2: pthread_mutex_destroy (&(assoc->lock)); - -FAIL1: free (assoc); FAIL0: -- cgit v1.2.3