summaryrefslogtreecommitdiff
path: root/time.c
diff options
context:
space:
mode:
authornagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-07 16:44:32 +0000
committernagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2017-02-07 16:44:32 +0000
commit15fbd0aa9b18bf80d2a57e51099773872bc00671 (patch)
tree15e9c348cc399f4505d20505847f88016b4afceb /time.c
parent24a575800189c766a1d8371da03691d57de1f81b (diff)
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_3@57567 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'time.c')
-rw-r--r--time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/time.c b/time.c
index 603fe8bf63..7c0cf8bd92 100644
--- a/time.c
+++ b/time.c
@@ -2603,7 +2603,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)) {