diff options
| author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-23 18:02:05 +0000 |
|---|---|---|
| committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-05-23 18:02:05 +0000 |
| commit | d15084fbcfffeed05be5b4c4f652ccb67ca8ebab (patch) | |
| tree | 076ca6bfce737b088cebbaa588616939b2ee6067 /ext | |
| parent | e197429a76bffa1d801c6ec46862c6f417982cdb (diff) | |
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]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@50625 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
| -rw-r--r-- | ext/-test-/printf/printf.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/-test-/printf/printf.c b/ext/-test-/printf/printf.c index ef7570f426..666f5592e5 100644 --- a/ext/-test-/printf/printf.c +++ b/ext/-test-/printf/printf.c @@ -20,7 +20,7 @@ printf_test_q(VALUE self, VALUE obj) } 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, VALUE self) *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; |