diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 10:28:14 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-03-11 10:28:14 +0000 |
| commit | b5154b0eb71f0b1c523a1361fff2221907c87fc5 (patch) | |
| tree | bb6b573fc7a2411ed7c551b7709c5fe7b088e882 /hash.c | |
| parent | a3cfd380c430567f3d7289ace7e467dda315418c (diff) | |
merge revision(s) 57173-57175: [Backport #13068]
------------------------------------------------------------------------
r57173 | nobu | 2016-12-24 22:19:50 +0900 (Sat, 24 Dec 2016) | 4 lines
compile.c: constify
* compile.c (method_for_self): constify an argument of build
function for VC6.
------------------------------------------------------------------------
r57174 | nobu | 2016-12-24 22:21:30 +0900 (Sat, 24 Dec 2016) | 4 lines
hash.c: split long long literals
* hash.c (prime1, prime2): split long long literals for platforms
where LL suffix is not supported, e.g., VC6.
------------------------------------------------------------------------
r57175 | nobu | 2016-12-24 22:22:53 +0900 (Sat, 24 Dec 2016) | 4 lines
regint.h: version for secure functions
* regint.h (xvsnprintf): secure version functions are not
supported on old VC.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_4@57831 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'hash.c')
| -rw-r--r-- | hash.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -220,8 +220,8 @@ rb_any_hash(VALUE a) tailored Spooky or City hash function can be. */ /* Here we two primes with random bit generation. */ -static const uint64_t prime1 = 0x2e0bb864e9ea7df5ULL; -static const uint64_t prime2 = 0xcdb32970830fcaa1ULL; +static const uint64_t prime1 = ((uint64_t)0x2e0bb864 << 32) | 0xe9ea7df5; +static const uint64_t prime2 = ((uint64_t)0xcdb32970 << 32) | 0x830fcaa1; static inline uint64_t |