usa	2016-12-27 20:44:17 +0900 (Tue, 27 Dec 2016)

  New Revision: 57225

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

  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_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/time.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/time.c
===================================================================
--- ruby_2_2/time.c	(revision 57224)
+++ ruby_2_2/time.c	(revision 57225)
@@ -2562,7 +2562,7 @@ obj2subsecx(VALUE obj, VALUE *subsecx) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/time.c#L2562
     return obj2ubits(obj, 6); /* vtm->sec */
 }
 
-static long
+static VALUE
 usec2subsecx(VALUE obj)
 {
     if (RB_TYPE_P(obj, T_STRING)) {
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 57224)
+++ ruby_2_2/ChangeLog	(revision 57225)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Tue Dec 27 20:43:54 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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  <nobu@r...>
 
 	* eval.c (exc_setup_cause): always set cause of cause to get rid of
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 57224)
+++ ruby_2_2/version.h	(revision 57225)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #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

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


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