summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrpj <rpj>2002-07-30 17:26:17 +0000
committerrpj <rpj>2002-07-30 17:26:17 +0000
commit6ae85d969228650bd4cf432bd4d6dcd959bf1a59 (patch)
treefffdf7e30cc3e1da93d8c4149f385c9e1ad0e484
parentd9bad66cbb8823ad786ac480330db1c05e85557a (diff)
*** empty log message ***
-rw-r--r--ChangeLog9
-rw-r--r--ptw32_threadDestroy.c12
2 files changed, 15 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index ffe2087..16a9fa3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2002-07-31 Ross Johnson <rpj@special.ise.canberra.edu.au>
+
+ * ptw32_threadStart.c (ptw32_threadStart): Thread cancelLock
+ destruction moved to ptw32_threadDestroy().
+
+ * ptw32_threadDestroy.c (ptw32_threadDestroy): Destroy
+ the thread's cancelLock. Moved here from ptw32_threadStart.c
+ to cleanup implicit threads as well.
+
2002-07-30 Alexander Terekhov <TEREKHOV@de.ibm.com>
* pthread_cond_wait.c (ptw32_cond_wait_cleanup):
diff --git a/ptw32_threadDestroy.c b/ptw32_threadDestroy.c
index 37fda08..1c503a6 100644
--- a/ptw32_threadDestroy.c
+++ b/ptw32_threadDestroy.c
@@ -51,18 +51,18 @@ ptw32_threadDestroy (pthread_t thread)
ptw32_callUserDestroyRoutines (thread);
if (thread->cancelEvent != NULL)
- {
- CloseHandle (thread->cancelEvent);
- }
+ {
+ CloseHandle (thread->cancelEvent);
+ }
(void) pthread_mutex_destroy(&thread->cancelLock);
#if ! defined (__MINGW32__) || defined (__MSVCRT__)
/* See documentation for endthread vs endthreadex. */
if( thread->threadH != 0 )
- {
- CloseHandle( thread->threadH );
- }
+ {
+ CloseHandle( thread->threadH );
+ }
#endif
free (thread);