From c56b2c10848b14e4cfa653bd73d372505ead499f Mon Sep 17 00:00:00 2001
From: shugo <shugo@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 23 Feb 2007 01:56:43 +0000
Subject: [PATCH] * thread_pthread.ci (native_mutex_lock): do not call  
 pthread_mutex_trylock().

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11811 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog         | 5 +++++
 thread_pthread.ci | 9 ++-------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c654ba3997..5129f953f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri Feb 23 10:53:21 2007  Shugo Maeda  <shugo@ruby-lang.org>
+
+	* thread_pthread.ci (native_mutex_lock): do not call
+	  pthread_mutex_trylock().
+
 Fri Feb 23 10:31:16 2007  Minero Aoki  <aamine@loveruby.net>
 
 	* dln.c: use dlopen on Mac OS X 10.3 or later.
diff --git a/thread_pthread.ci b/thread_pthread.ci
index a8ffcb0c78..b28301704a 100644
--- a/thread_pthread.ci
+++ b/thread_pthread.ci
@@ -16,13 +16,8 @@ void
 native_mutex_lock(pthread_mutex_t *lock)
 {
     int r;
-    r = pthread_mutex_trylock(lock);
-    if (r == EBUSY) {
-	r = pthread_mutex_lock(lock);
-	
-	if (r != 0) {
-	    rb_bug("pthread_mutex_lock: %d", r);
-	}
+    if ((r = pthread_mutex_lock(lock)) != 0) {
+	rb_bug("pthread_mutex_lock: %d", r);
     }
 }