nobu	2015-04-14 11:25:27 +0900 (Tue, 14 Apr 2015)

  New Revision: 50305

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

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

  Modified files:
    trunk/ChangeLog
    trunk/ext/-test-/printf/printf.c
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 50304)
+++ ChangeLog	(revision 50305)
@@ -1,3 +1,8 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Apr 14 11:24:56 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]
+
 Tue Apr 14 08:59:04 2015  Zachary Scott  <e@z...>
 
         * gc.c: [DOC] Improve documentation for ObjectSpace.count_objects
Index: ext/-test-/printf/printf.c
===================================================================
--- ext/-test-/printf/printf.c	(revision 50304)
+++ ext/-test-/printf/printf.c	(revision 50305)
@@ -20,7 +20,7 @@ printf_test_q(VALUE self, VALUE obj) https://github.com/ruby/ruby/blob/trunk/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/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;

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