summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-17 07:20:58 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-06-17 07:20:58 (GMT)
commit3c5664563446185c0b7d95de013d47b766122ba8 (patch)
tree1dd5c73b1f72b1268485ac4dd103c9245a9963cc
parentdc320f43e1421afaaba0ebe466e6c133978d599a (diff)
thread_win32.c: USE_WIN32_MUTEX
* thread_win32.c (native_mutex_lock, native_mutex_destroy): fix for USE_WIN32_MUTEX. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36118 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread_win32.c4
2 files changed, 6 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index c6cc400..02dc8ec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
-Sun Jun 17 16:20:50 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Sun Jun 17 16:20:56 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * thread_win32.c (native_mutex_lock, native_mutex_destroy): fix for
+ USE_WIN32_MUTEX.
* thread_win32.c (native_cond_timedwait_ms): rename reserved pattern
name. user defined symbols should not start with __.
diff --git a/thread_win32.c b/thread_win32.c
index 2410cfa..b77fdbb 100644
--- a/thread_win32.c
+++ b/thread_win32.c
@@ -343,8 +343,8 @@ native_mutex_lock(rb_thread_lock_t *lock)
w32_mutex_lock(*lock);
#else
EnterCriticalSection(lock);
- return 0;
#endif
+ return 0;
}
static int
@@ -394,7 +394,7 @@ static void
native_mutex_destroy(rb_thread_lock_t *lock)
{
#if USE_WIN32_MUTEX
- w32_close_handle(lock);
+ w32_close_handle(*lock);
#else
DeleteCriticalSection(lock);
#endif