naruse	2017-03-11 19:28:14 +0900 (Sat, 11 Mar 2017)

  New Revision: 57831

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=57831

  Log:
    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.

  Modified directories:
    branches/ruby_2_4/
  Modified files:
    branches/ruby_2_4/compile.c
    branches/ruby_2_4/hash.c
    branches/ruby_2_4/regint.h
    branches/ruby_2_4/version.h
Index: ruby_2_4/compile.c
===================================================================
--- ruby_2_4/compile.c	(revision 57830)
+++ ruby_2_4/compile.c	(revision 57831)
@@ -7058,7 +7058,7 @@ typedef struct { https://github.com/ruby/ruby/blob/trunk/ruby_2_4/compile.c#L7058
 
 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;
Index: ruby_2_4/hash.c
===================================================================
--- ruby_2_4/hash.c	(revision 57830)
+++ ruby_2_4/hash.c	(revision 57831)
@@ -220,8 +220,8 @@ rb_any_hash(VALUE a) https://github.com/ruby/ruby/blob/trunk/ruby_2_4/hash.c#L220
    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
Index: ruby_2_4/version.h
===================================================================
--- ruby_2_4/version.h	(revision 57830)
+++ ruby_2_4/version.h	(revision 57831)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/version.h#L1
 #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
Index: ruby_2_4/regint.h
===================================================================
--- ruby_2_4/regint.h	(revision 57830)
+++ ruby_2_4/regint.h	(revision 57831)
@@ -202,7 +202,7 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_4/regint.h#L202
 #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

Property changes on: ruby_2_4
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57173-57175


--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/