knu	2008-05-28 17:55:41 +0900 (Wed, 28 May 2008)

  New Revision: 16673

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/string.c

  Log:
    Merge from ruby_1_8.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/ChangeLog?r1=16673&r2=16672&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8_7/string.c?r1=16673&r2=16672&diff_format=u

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 16672)
+++ ruby_1_8_7/ChangeLog	(revision 16673)
@@ -1,3 +1,8 @@
+Wed May 28 17:54:29 2008  Akinori MUSHA  <knu@i...>
+
+	* string.c (rb_str_start_with): Remove an unused variable.
+	  (rb_str_upto_m): Fix a prototype.
+
 Wed May 28 17:48:28 2008  Akinori MUSHA  <knu@i...>
 
 	* range.c (range_step): Fix brokenness when a non-integer numeric
Index: ruby_1_8_7/string.c
===================================================================
--- ruby_1_8_7/string.c	(revision 16672)
+++ ruby_1_8_7/string.c	(revision 16673)
@@ -1514,7 +1514,8 @@
 static VALUE
 rb_str_upto_m(argc, argv, beg)
     int argc;
-    VALUE argv, beg;
+    VALUE *argv;
+    VALUE beg;
 {
     VALUE end, exclusive;
 
@@ -4836,7 +4837,6 @@
     VALUE str;
 {
     int i;
-    long pos;
     VALUE pat;
 
     for (i=0; i<argc; i++) {

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