./ChangeLog:

2000-12-29  Ross Johnson  <rpj@special.ise.canberra.edu.au>

        * Makefile: Back-out "for" loops which don't work.

        * GNUmakefile: Remove the fake.a target; add the "realclean"
        target; don't remove built libs under the "clean" target.

        * config.h: Add a guard against multiple inclusion.

        * semaphore.h: Add some defines from config.h to make
        semaphore.h independent of config.h when building apps.

        * pthread.h (_errno): Back-out previous fix until we know how to
        fix it properly.

        * implement.h (lockCount): Add missing element to pthread_mutex_t_.

        * sync.c (pthread_join): Spelling fix in comment.

        * private.c (ptw32_threadStart): Reset original termination
        function (C++).
        (ptw32_threadStart): Cleanup detached threads early in case
        the library is statically linked.
        (ptw32_callUserDestroyRoutines): Remove [SEH] __try block from
        destructor call so that unhandled exceptions will be passed through
        to the  system; call terminate() from [C++] try block for the same
        reason.

        * tsd.c (pthread_getspecific): Add comment.

        * mutex.c (pthread_mutex_init): Initialise new elements in
        pthread_mutex_t.
        (pthread_mutex_unlock): Invert "pthread_equal()" test.

2000-12-28  Ross Johnson  <rpj@special.ise.canberra.edu.au>

        * semaphore.c (mode_t): Use ifndef HAVE_MODE_T to include definition.

        * config.h.in (HAVE_MODE_T): Added.
        (_UWIN): Start adding defines for the UWIN package.

./tests/ChangeLog:
2000-12-29  Ross Johnson  <rpj@special.ise.canberra.edu.au>

        * GNUmakefile: Add mutex4 test; ensure libpthreadw32.a is
        removed for "clean" target.
        * Makefile: Add mutex4 test.

        * exception3.c: Remove SEH code; automatically pass the test
        under SEH (which is an N/A environment).

        * mutex4.c: New test.

        * eyal1.c (do_work_unit): Add a dummy "if" to force the
        optimiser to retain code; reduce thread work loads.

        * condvar8.c (main): Add an additional "assert" for debugging;
        increase pthread_cond_signal timeout.

1 files changed, 3 insertions, 1 deletions

diff --git a/mutex.c b/mutex.c
index d31b3b2..3e4722e 100644
--- a/mutex.c
+++ b/mutex.c
@@ -105,6 +105,8 @@ pthread_mutex_init(pthread_mutex_t *mutex, const pthread_mutexattr_t *attr)
     }
 
   mx->mutex = 0;
+  mx->lockCount = 0;
+  mx->ownerThread = NULL;
 
   if (attr != NULL
       && *attr != NULL
@@ -586,7 +588,7 @@ pthread_mutex_unlock(pthread_mutex_t *mutex)
     {
       pthread_t self = pthread_self();
 
-      if (pthread_equal(mx->ownerThread, self) == 0)
+      if (pthread_equal(mx->ownerThread, self))
 	{
 	  int oldCount = mx->lockCount;
 	  pthread_t oldOwner = mx->ownerThread;