summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-08 20:50:37 +0000
committernormal <normal@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-07-08 20:50:37 +0000
commitb10058ae3656b4c7b76833c01730a141cf45c6c0 (patch)
tree6f64d76282c285ce87e1a36b754438259c91b539
parent3e14cdc45b43a0d8a39b0bac66349441cdb34e5d (diff)
thread_pthread.h: do not expose pthread type for lock
* thread_pthread.h (struct rb_global_vm_lock_struct): do not expose pthread type for lock git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@46761 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--thread_pthread.h2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 0f15598301..6d249cc1e7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Jul 9 05:49:08 2014 Eric Wong <e@80x24.org>
+
+ * thread_pthread.h (struct rb_global_vm_lock_struct):
+ do not expose pthread type for lock
+
Wed Jul 9 05:41:40 2014 Eric Wong <e@80x24.org>
* thread_pthread.h: remove unneeded semaphore.h include
diff --git a/thread_pthread.h b/thread_pthread.h
index 0717ecb326..6890f8ab43 100644
--- a/thread_pthread.h
+++ b/thread_pthread.h
@@ -35,7 +35,7 @@ typedef struct native_thread_data_struct {
typedef struct rb_global_vm_lock_struct {
/* fast path */
unsigned long acquired;
- pthread_mutex_t lock;
+ rb_nativethread_lock_t lock;
/* slow path */
volatile unsigned long waiting;