nagachika	2017-02-08 01:44:32 +0900 (Wed, 08 Feb 2017)

  New Revision: 57567

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

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

  Modified directories:
    branches/ruby_2_3/
  Modified files:
    branches/ruby_2_3/time.c
    branches/ruby_2_3/version.h
Index: ruby_2_3/version.h
===================================================================
--- ruby_2_3/version.h	(revision 57566)
+++ ruby_2_3/version.h	(revision 57567)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_3/version.h#L1
 #define RUBY_VERSION "2.3.3"
 #define RUBY_RELEASE_DATE "2017-02-08"
-#define RUBY_PATCHLEVEL 239
+#define RUBY_PATCHLEVEL 240
 
 #define RUBY_RELEASE_YEAR 2017
 #define RUBY_RELEASE_MONTH 2
Index: ruby_2_3/time.c
===================================================================
--- ruby_2_3/time.c	(revision 57566)
+++ ruby_2_3/time.c	(revision 57567)
@@ -2603,7 +2603,7 @@ obj2subsecx(VALUE obj, VALUE *subsecx) https://github.com/ruby/ruby/blob/trunk/ruby_2_3/time.c#L2603
     return obj2ubits(obj, 6); /* vtm->sec */
 }
 
-static long
+static VALUE
 usec2subsecx(VALUE obj)
 {
     if (RB_TYPE_P(obj, T_STRING)) {

Property changes on: ruby_2_3
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk:r57172


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