diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 00:12:11 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-05-31 00:12:11 +0000 |
commit | bd9588cdfc32d52e57d63d9dd3d188048839df60 (patch) | |
tree | dd5767814cd505cd48b0565ad8d7d0f2fa466b11 /vm_core.h | |
parent | fffe09dd3dabd7dbcdbb1483bbed350563cd3b65 (diff) |
merges r31609 from trunk into ruby_1_9_2.
--
* vm_core.h (rb_thread_struct): add volatile to
transition_for_lock because it is not protected by lock.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@31835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'vm_core.h')
-rw-r--r-- | vm_core.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -427,7 +427,7 @@ typedef struct rb_thread_struct struct rb_unblock_callback unblock; VALUE locking_mutex; struct rb_mutex_struct *keeping_mutexes; - int transition_for_lock; + volatile int transition_for_lock; struct rb_vm_tag *tag; struct rb_vm_protect_tag *protect_tag; |