diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:40:27 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-15 15:40:27 +0000 |
commit | fb117753c5d5110e1c669c7bd8c6e5ef0efb57b8 (patch) | |
tree | 8e15ca4aecdb80f240435f0db50593cfda3a8181 | |
parent | b371ce9d6a4bcb4bc315054769257650f24075e4 (diff) |
merges r21533 from trunk into ruby_1_9_1.
* gc.c (gc_with_gvl): suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21569 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | gc.c | 2 |
2 files changed, 5 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Fri Jan 16 00:19:55 2009 Koichi Sasada <ko1@atdot.net> + + * gc.c (gc_with_gvl): suppress warnings. + Thu Jan 15 20:44:30 2009 Tanaka Akira <akr@fsij.org> * tool/file2lastrev.rb: RUBY_REVISION must be an integer. @@ -582,7 +582,7 @@ negative_size_allocation_error(const char *msg) static void * gc_with_gvl(void *ptr) { - return (void *)garbage_collect((rb_objspace_t *)ptr); + return (void *)(VALUE)garbage_collect((rb_objspace_t *)ptr); } static int |