nagachika	2015-05-24 03:02:05 +0900 (Sun, 24 May 2015)

  New Revision: 50625

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

  Log:
    merge revision(s) 50305: [Backport #11065]
    
    * ext/-test-/printf/printf.c (uint_to_str): renamed to get rid of
      conflict on cygwin.  [ruby-core:68877] [Bug #11065]

  Modified directories:
    branches/ruby_2_2/
  Modified files:
    branches/ruby_2_2/ChangeLog
    branches/ruby_2_2/ext/-test-/printf/printf.c
    branches/ruby_2_2/version.h
Index: ruby_2_2/ChangeLog
===================================================================
--- ruby_2_2/ChangeLog	(revision 50624)
+++ ruby_2_2/ChangeLog	(revision 50625)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ChangeLog#L1
+Sun May 24 03:01:17 2015  Nobuyoshi Nakada  <nobu@r...>
+
+	* ext/-test-/printf/printf.c (uint_to_str): renamed to get rid of
+	  conflict on cygwin.  [ruby-core:68877] [Bug #11065]
+
 Sun May 24 02:44:53 2015  Koichi Sasada  <ko1@a...>
 
 	* vm.c (vm_exec): check other events when RETURN is thrown.
Index: ruby_2_2/ext/-test-/printf/printf.c
===================================================================
--- ruby_2_2/ext/-test-/printf/printf.c	(revision 50624)
+++ ruby_2_2/ext/-test-/printf/printf.c	(revision 50625)
@@ -20,7 +20,7 @@ printf_test_q(VALUE self, VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/-test-/printf/printf.c#L20
 }
 
 static char *
-utoa(char *p, char *e, unsigned int x)
+uint_to_str(char *p, char *e, unsigned int x)
 {
     char *e0 = e;
     if (e <= p) return p;
@@ -71,12 +71,12 @@ printf_test_call(int argc, VALUE *argv, https://github.com/ruby/ruby/blob/trunk/ruby_2_2/ext/-test-/printf/printf.c#L71
 	    *p++ = '0';
 	}
 	if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("width"))))) {
-	    p = utoa(p, format + sizeof(format), NUM2UINT(v));
+	    p = uint_to_str(p, format + sizeof(format), NUM2UINT(v));
 	}
 	if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("prec"))))) {
 	    *p++ = '.';
 	    if (FIXNUM_P(v))
-		p = utoa(p, format + sizeof(format), NUM2UINT(v));
+		p = uint_to_str(p, format + sizeof(format), NUM2UINT(v));
 	}
     }
     *p++ = cnv;
Index: ruby_2_2/version.h
===================================================================
--- ruby_2_2/version.h	(revision 50624)
+++ ruby_2_2/version.h	(revision 50625)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_2/version.h#L1
 #define RUBY_VERSION "2.2.3"
 #define RUBY_RELEASE_DATE "2015-05-24"
-#define RUBY_PATCHLEVEL 121
+#define RUBY_PATCHLEVEL 122
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 5

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


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