Skip to content

Commit 70c59ba

Browse files
committed
merge revision(s) 61518: [Backport ruby#14260]
bit fields treating negative values should be declared as signed int * internal.h (struct vm_ifunc_argc): Bit fields are unsigned by default. For storing nagative values to bit fields, they must be declated as signed int. Fix multiple test failure observed by 32-bit binaries compiled with Oracle Developer Studio (Solaris Studio) 12.x on Solaris 10 on sparc architecture. [Bug ruby#14260] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@61660 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
1 parent a410ff6 commit 70c59ba

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

internal.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -914,8 +914,8 @@ struct vm_throw_data {
914914

915915
struct vm_ifunc_argc {
916916
#if SIZEOF_INT * 2 > SIZEOF_VALUE
917-
int min: (SIZEOF_VALUE * CHAR_BIT) / 2;
918-
int max: (SIZEOF_VALUE * CHAR_BIT) / 2;
917+
signed int min: (SIZEOF_VALUE * CHAR_BIT) / 2;
918+
signed int max: (SIZEOF_VALUE * CHAR_BIT) / 2;
919919
#else
920920
int min, max;
921921
#endif

version.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#define RUBY_VERSION "2.5.0"
2-
#define RUBY_RELEASE_DATE "2018-01-06"
3-
#define RUBY_PATCHLEVEL 9
2+
#define RUBY_RELEASE_DATE "2018-01-08"
3+
#define RUBY_PATCHLEVEL 10
44

55
#define RUBY_RELEASE_YEAR 2018
66
#define RUBY_RELEASE_MONTH 1
7-
#define RUBY_RELEASE_DAY 6
7+
#define RUBY_RELEASE_DAY 8
88

99
#include "ruby/version.h"
1010

0 commit comments

Comments
 (0)