Merge from ruby_1_8.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@16673 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 7 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index a26643af79..f4b63c0c95 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed May 28 17:54:29 2008  Akinori MUSHA  <knu@iDaemons.org>
+
+	* 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@iDaemons.org>
 
 	* range.c (range_step): Fix brokenness when a non-integer numeric
diff --git a/string.c b/string.c
index 7e26edb5b2..3d8a664962 100644
--- a/string.c
+++ b/string.c
@@ -1514,7 +1514,8 @@ rb_str_upto(beg, end, excl)
 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 @@ rb_str_start_with(argc, argv, str)
     VALUE str;
 {
     int i;
-    long pos;
     VALUE pat;
 
     for (i=0; i<argc; i++) {