diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index b292188c690..8ded8934041 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,7 @@ +Thu Sep 23 07:19:12 1999 Chris Ball + + * thr-posix.c (__objc_mutex_deallocate): made deallocate work. + Tue Sep 21 07:47:10 1999 Jeffrey A Law (law@cygnus.com) * Makefile.in (gc.o, gc_gc.o): Do not pass -fgnu-runtime to diff --git a/libobjc/thr-posix.c b/libobjc/thr-posix.c index 5b40f711be8..a73c6277791 100644 --- a/libobjc/thr-posix.c +++ b/libobjc/thr-posix.c @@ -145,6 +145,20 @@ __objc_mutex_allocate(objc_mutex_t mutex) int __objc_mutex_deallocate(objc_mutex_t mutex) { + int count = 1; + + /* + * Posix Threads specifically require that the thread be unlocked for + * pthread_mutex_destroy to work. + */ + + while ( count ) + { + if (( count = pthread_mutex_unlock((pthread_mutex_t *)mutex->backend)) + < 0 ) + return -1; + } + if (pthread_mutex_destroy((pthread_mutex_t *)mutex->backend)) return -1;