diff options
author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-22 08:52:11 +0000 |
---|---|---|
committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-12-22 08:52:11 +0000 |
commit | 52220154a8310d0140829daa1de665003bb11dec (patch) | |
tree | 88573f478ccd41c18c42c1b7900c9e02b6400d96 /include | |
parent | 072ed558d5b27f484ba4fb65f5e778ffad54d951 (diff) | |
download | ruby-52220154a8310d0140829daa1de665003bb11dec.tar.gz |
force hash values fixable
* include/ruby/ruby.h (RB_ST2FIX): force fixable on LLP64 environment.
* hash.c (any_hash): ditto.
[ruby-core:84395] [Bug #14218]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@61413 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include')
-rw-r--r-- | include/ruby/ruby.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/ruby/ruby.h b/include/ruby/ruby.h index 0959413dac..56aca0db5f 100644 --- a/include/ruby/ruby.h +++ b/include/ruby/ruby.h @@ -1575,7 +1575,11 @@ rb_num2char_inline(VALUE x) #define NUM2CHR(x) RB_NUM2CHR(x) #define CHR2FIX(x) RB_CHR2FIX(x) +#if SIZEOF_LONG < SIZEOF_VALUE +#define RB_ST2FIX(h) RB_LONG2FIX((long)((h) > 0 ? (h) & (unsigned long)-1 >> 2 : (h) | ~((unsigned long)-1 >> 2))) +#else #define RB_ST2FIX(h) RB_LONG2FIX((long)(h)) +#endif #define ST2FIX(h) RB_ST2FIX(h) #define RB_ALLOC_N(type,n) ((type*)ruby_xmalloc2((size_t)(n),sizeof(type))) |