From c047ca63139fd3b9e0dedc224dffe04666204dd1 Mon Sep 17 00:00:00 2001
From: rpj <rpj>
Date: Sat, 1 Jan 2005 14:25:02 +0000
Subject: ''

---
 ANNOUNCE             |  2 +-
 pthread.h            |  4 ++--
 pthread_mutex_lock.c | 13 +++++++------
 version.rc           |  2 +-
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 778c95a..a10af55 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,4 +1,4 @@
-		 PTHREADS-WIN32 SNAPSHOT 2004-11-22
+		 PTHREADS-WIN32 SNAPSHOT 2005-01-02
 		 ----------------------------------
 	 Web Site: http://sources.redhat.com/pthreads-win32/
 	FTP Site: ftp://sources.redhat.com/pub/pthreads-win32
diff --git a/pthread.h b/pthread.h
index ce83f34..199940e 100644
--- a/pthread.h
+++ b/pthread.h
@@ -37,8 +37,8 @@
  * See the README file for an explanation of the pthreads-win32 version
  * numbering scheme and how the DLL is named etc.
  */
-#define PTW32_VERSION 1,0,0,0
-#define PTW32_VERSION_STRING "1, 0, 0, 0\0"
+#define PTW32_VERSION 1,1,0,0
+#define PTW32_VERSION_STRING "1, 1, 0, 0\0"
 
 /* There are three implementations of cancel cleanup.
  * Note that pthread.h is included in both application
diff --git a/pthread_mutex_lock.c b/pthread_mutex_lock.c
index 870208b..ce5e5f6 100644
--- a/pthread_mutex_lock.c
+++ b/pthread_mutex_lock.c
@@ -114,17 +114,18 @@ pthread_mutex_lock (pthread_mutex_t * mutex)
                               (LPLONG) &mx->lock_idx,
 			      (LONG) -1) != 0)
 		{
-	          if (WAIT_OBJECT_0 == WaitForSingleObject (mx->event, INFINITE))
-	            {
-		      mx->recursive_count = 1;
-		      mx->ownerThread = self;
-	            }
-		  else
+	          if (WAIT_OBJECT_0 != WaitForSingleObject (mx->event, INFINITE))
 		    {
 	              result = EINVAL;
 		      break;
 		    }
 		}
+
+	      if (0 == result)
+		{
+		  mx->recursive_count = 1;
+		  mx->ownerThread = self;
+		}
 	    }
 	}
     }
diff --git a/version.rc b/version.rc
index 128f444..721e612 100644
--- a/version.rc
+++ b/version.rc
@@ -73,7 +73,7 @@ BEGIN
             VALUE "InternalName", PTW32_VERSIONINFO_NAME
             VALUE "OriginalFilename", PTW32_VERSIONINFO_NAME
             VALUE "CompanyName", "Open Source Software community project\0"
-            VALUE "LegalCopyright", "Copyright (C) Project contributors 1998-2004\0"
+            VALUE "LegalCopyright", "Copyright (C) Project contributors 1998-2005\0"
             VALUE "Licence", "LGPL\0"
             VALUE "Info", "http://sources.redhat.com/pthreads-win32/\0"
 	    VALUE "Comment", PTW32_VERSIONINFO_COMMENT
-- 
cgit v1.2.3