From 7015fcf9f88ad4f0131439d6c1c30cef320f9c8c Mon Sep 17 00:00:00 2001 From: usa Date: Tue, 27 Dec 2016 11:44:17 +0000 Subject: merge revision(s) 57172: [Backport #13066] time.c: fix type of usec2subsecx * time.c (usec2subsecx): fix return type, which is a numeric object but not a long int. [ruby-dev:49912] [Bug #13066] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@57225 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ time.c | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 43d3f13318..2a6d3dbe23 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Dec 27 20:43:54 2016 Nobuyoshi Nakada + + * time.c (usec2subsecx): fix return type, which is a numeric object but + not a long int. [Bug #13066] + Tue Dec 27 20:39:28 2016 Nobuyoshi Nakada * eval.c (exc_setup_cause): always set cause of cause to get rid of diff --git a/time.c b/time.c index 4af193d19a..ac2267a9f8 100644 --- a/time.c +++ b/time.c @@ -2562,7 +2562,7 @@ obj2subsecx(VALUE obj, VALUE *subsecx) return obj2ubits(obj, 6); /* vtm->sec */ } -static long +static VALUE usec2subsecx(VALUE obj) { if (RB_TYPE_P(obj, T_STRING)) { diff --git a/version.h b/version.h index 4749377fbe..0aadc90cff 100644 --- a/version.h +++ b/version.h @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.2.7" #define RUBY_RELEASE_DATE "2016-12-27" -#define RUBY_PATCHLEVEL 414 +#define RUBY_PATCHLEVEL 415 #define RUBY_RELEASE_YEAR 2016 #define RUBY_RELEASE_MONTH 12 -- cgit v1.2.3