diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 08:59:31 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-24 08:59:31 +0000 |
commit | 97cdb5ac25ddcf0e7664867f39ccaccc4d139c0e (patch) | |
tree | cfcc2932a3999bf25a6ac7289fb91685857e1504 /load.c | |
parent | 162cc94d15683be9b45bb70b40cfdb3f040b74e2 (diff) | |
download | ruby-97cdb5ac25ddcf0e7664867f39ccaccc4d139c0e.tar.gz |
* load.c (load_lock): reverted.
* thread.c (rb_barrier_wait): check for recursive wait.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14593 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'load.c')
-rw-r--r-- | load.c | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -345,8 +345,7 @@ load_lock(const char *ftptr) st_insert(loading_tbl, (st_data_t)ftptr, data); return (char *)ftptr; } - rb_barrier_wait((VALUE)data); - return 0; + return RTEST(rb_barrier_wait((VALUE)data)) ? (char *)ftptr : 0; } static void |