diff options
-rw-r--r-- | compile.c | 2 | ||||
-rw-r--r-- | hash.c | 4 | ||||
-rw-r--r-- | regint.h | 2 | ||||
-rw-r--r-- | version.h | 2 |
4 files changed, 5 insertions, 5 deletions
@@ -7058,7 +7058,7 @@ typedef struct { static const rb_iseq_t * method_for_self(VALUE name, VALUE arg, rb_insn_func_t func, - VALUE (*build)(rb_iseq_t *, LINK_ANCHOR *, VALUE)) + VALUE (*build)(rb_iseq_t *, LINK_ANCHOR *const, VALUE)) { VALUE path, absolute_path; accessor_args acc; @@ -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 @@ -202,7 +202,7 @@ #define xmemcpy memcpy #define xmemmove memmove -#if defined(_WIN32) && !defined(__GNUC__) +#if defined(RUBY_MSVCRT_VERSION) && RUBY_MSVCRT_VERSION >= 90 && !defined(__GNUC__) # define xalloca _alloca # define xvsnprintf(buf,size,fmt,args) _vsnprintf_s(buf,size,_TRUNCATE,fmt,args) # define xsnprintf sprintf_s @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.4.0" #define RUBY_RELEASE_DATE "2017-03-11" -#define RUBY_PATCHLEVEL 1 +#define RUBY_PATCHLEVEL 2 #define RUBY_RELEASE_YEAR 2017 #define RUBY_RELEASE_MONTH 3 |