archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-17 01:23:57 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

merge revision(s) 50305: [Backport #11065]

Browse source 
* ext/-test-/printf/printf.c (uint_to_str): renamed to get rid of
	  conflict on cygwin.  [ruby-core:68877] [Bug #11065]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2015-05-23 18:02:05 +00:00
parent e197429a76
commit d15084fbcf
3 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun May 24 03:01:17 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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@atdot.net> Sun May 24 02:44:53 2015 Koichi Sasada <ko1@atdot.net>
* vm.c (vm_exec): check other events when RETURN is thrown. * vm.c (vm_exec): check other events when RETURN is thrown.

6
ext/-test-/printf/printf.c
View file

@ -20,7 +20,7 @@ printf_test_q(VALUE self, VALUE obj)
} }
static char * static char *
utoa(char *p, char *e, unsigned int x) uint_to_str(char *p, char *e, unsigned int x)
{ {
char *e0 = e; char *e0 = e;
if (e <= p) return p; if (e <= p) return p;
@ -71,12 +71,12 @@ printf_test_call(int argc, VALUE *argv, VALUE self)
*p++ = '0'; *p++ = '0';
} }
if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("width"))))) { 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"))))) { if (!NIL_P(v = rb_hash_aref(opt, ID2SYM(rb_intern("prec"))))) {
*p++ = '.'; *p++ = '.';
if (FIXNUM_P(v)) if (FIXNUM_P(v))
p = utoa(p, format + sizeof(format), NUM2UINT(v)); p = uint_to_str(p, format + sizeof(format), NUM2UINT(v));
} }
} }
*p++ = cnv; *p++ = cnv;

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.2.3" #define RUBY_VERSION "2.2.3"
#define RUBY_RELEASE_DATE "2015-05-24" #define RUBY_RELEASE_DATE "2015-05-24"
#define RUBY_PATCHLEVEL 121 #define RUBY_PATCHLEVEL 122
#define RUBY_RELEASE_YEAR 2015 #define RUBY_RELEASE_YEAR 2015
#define RUBY_RELEASE_MONTH 5 #define RUBY_RELEASE_MONTH 5