summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-29 15:00:45 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-03-29 15:00:45 +0000
commit0ad168551355320c091045c0bb6d4b51798bbcc0 (patch)
treec6f82a3fd04a6389cfe25cfaa9fb949568e094cd
parent4634c34db318d157c1f741855dba9757cc8de1fd (diff)
* hash.c (any_hash): fix CI failure on L32LLP64 architecture.
The patch was provided by usa. [ruby-core:80484] [Bug #13376] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@58213 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--hash.c2
-rw-r--r--version.h6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index fdce669e44..593cdc3975 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Mar 29 23:47:31 2017 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
+
+ * hash.c (any_hash): fix CI failure on L32LLP64 architecture.
+ The patch was provided by usa. [ruby-core:80484] [Bug #13376]
+
Wed Mar 29 06:22:27 2017 CHIKANAGA Tomoyuki <nagachika@ruby-lang.org>
* hash.c (any_hash): fix Symbol#hash to be nondeterministic.
diff --git a/hash.c b/hash.c
index d9826c4053..e418b99c1f 100644
--- a/hash.c
+++ b/hash.c
@@ -168,7 +168,7 @@ any_hash(VALUE a, st_index_t (*other_func)(VALUE))
}
out:
hnum <<= 1;
- return (st_index_t)RSHIFT(hnum, 1);
+ return (long)RSHIFT(hnum, 1);
}
static st_index_t
diff --git a/version.h b/version.h
index 709d03b0cb..17b906b43c 100644
--- a/version.h
+++ b/version.h
@@ -1,10 +1,10 @@
#define RUBY_VERSION "2.3.4"
-#define RUBY_RELEASE_DATE "2017-03-29"
-#define RUBY_PATCHLEVEL 300
+#define RUBY_RELEASE_DATE "2017-03-30"
+#define RUBY_PATCHLEVEL 301
#define RUBY_RELEASE_YEAR 2017
#define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 29
+#define RUBY_RELEASE_DAY 30
#include "ruby/version.h"