ruby-changes:38496
From: usa <ko1@a...>
Date: Thu, 21 May 2015 13:38:27 +0900 (JST)
Subject: [ruby-changes:38496] usa:r50577 (ruby_2_1): merge revision(s) 50305: [Backport #11065]
usa 2015-05-21 13:38:14 +0900 (Thu, 21 May 2015) New Revision: 50577 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=50577 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_1/ Modified files: branches/ruby_2_1/ChangeLog branches/ruby_2_1/ext/-test-/printf/printf.c branches/ruby_2_1/version.h Index: ruby_2_1/ChangeLog =================================================================== --- ruby_2_1/ChangeLog (revision 50576) +++ ruby_2_1/ChangeLog (revision 50577) @@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ChangeLog#L1 +Thu May 21 13:32:52 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] + Thu May 21 13:28:03 2015 Koichi Sasada <ko1@a...> * vm.c (vm_exec): check other events when RETURN is thrown. Index: ruby_2_1/ext/-test-/printf/printf.c =================================================================== --- ruby_2_1/ext/-test-/printf/printf.c (revision 50576) +++ ruby_2_1/ext/-test-/printf/printf.c (revision 50577) @@ -28,7 +28,7 @@ printf_test_q(VALUE self, VALUE obj) https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/-test-/printf/printf.c#L28 } 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; @@ -79,12 +79,12 @@ printf_test_call(int argc, VALUE *argv, https://github.com/ruby/ruby/blob/trunk/ruby_2_1/ext/-test-/printf/printf.c#L79 *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_1/version.h =================================================================== --- ruby_2_1/version.h (revision 50576) +++ ruby_2_1/version.h (revision 50577) @@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_1/version.h#L1 #define RUBY_VERSION "2.1.7" #define RUBY_RELEASE_DATE "2015-05-21" -#define RUBY_PATCHLEVEL 350 +#define RUBY_PATCHLEVEL 351 #define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_MONTH 5 Property changes on: ruby_2_1 ___________________________________________________________________ Modified: svn:mergeinfo Merged /trunk:r50305 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/