diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-21 15:30:44 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-21 15:30:44 +0000 |
commit | e31b67700b8c71061bd0ee33a7235d423ca6f6f0 (patch) | |
tree | 343c458a70802ee2a9edcc9aff286ab169e18413 | |
parent | 8346f7b2ad3138bdc30c8b39c8de13f3b392c059 (diff) | |
download | ruby-e31b67700b8c71061bd0ee33a7235d423ca6f6f0.tar.gz |
* object.c (rb_obj_hash): shouldn't assume object_id can be long.
based on a patch by Heesob Park at [ruby-core:51060].
cf. [Backport #7454]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38539 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | object.c | 9 |
2 files changed, 14 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Dec 22 00:28:46 2012 NAKAMURA Usaku <usa@ruby-lang.org> + + * object.c (rb_obj_hash): shouldn't assume object_id can be long. + based on a patch by Heesob Park at [ruby-core:51060]. + cf. [Backport #7454] + Fri Dec 21 23:15:25 2012 Kouhei Sutou <kou@cozmixng.org> * ext/fiddle/lib/fiddle/struct.rb (Fiddle::CStructEntity#set_ctypes): @@ -125,7 +125,14 @@ VALUE rb_obj_hash(VALUE obj) { VALUE oid = rb_obj_id(obj); - st_index_t h = rb_hash_end(rb_hash_start(NUM2LONG(oid))); +#if SIZEOF_LONG == SIZEOF_VOIDP + st_index_t index = NUM2LONG(oid); +#elif SIZEOF_LONG_LONG == SIZEOF_VOIDP + st_index_t index = NUM2LL(oid); +#else +# error not supported +#endif + st_index_t h = rb_hash_end(rb_hash_start(index)); return LONG2FIX(h); } |