summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--eval.c2
-rw-r--r--string.c4
-rw-r--r--version.h6
4 files changed, 9 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog
index c193600be3..1259442d41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,6 @@
-Tue Jun 10 12:58:07 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+Tue Jun 10 13:40:25 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * eval.c (rb_thread_select), string.c (str_gsub): suppress warnings.
* ext/io/wait/wait.c (FIONREAD_POSSIBLE_P): suppress warnings.
diff --git a/eval.c b/eval.c
index 9391b5b927..43455acbab 100644
--- a/eval.c
+++ b/eval.c
@@ -11262,7 +11262,7 @@ rb_thread_select(max, read, write, except, timeout)
struct timeval *timeout;
{
#ifndef linux
- double limit;
+ double limit = 0;
#endif
int n;
diff --git a/string.c b/string.c
index 5f1414ac34..45bfe18fc7 100644
--- a/string.c
+++ b/string.c
@@ -2140,7 +2140,7 @@ str_gsub(argc, argv, str, bang)
slen = RSTRING(str)->len;
rb_str_locktmp(dest);
- while (beg >= 0) {
+ do {
n++;
match = rb_backref_get();
regs = RMATCH(match)->regs;
@@ -2187,7 +2187,7 @@ str_gsub(argc, argv, str, bang)
cp = RSTRING(str)->ptr + offset;
if (offset > RSTRING(str)->len) break;
beg = rb_reg_search(pat, str, offset, 0);
- }
+ } while (beg >= 0);
if (RSTRING(str)->len > offset) {
len = bp - buf;
if (blen - len < RSTRING(str)->len - offset) {
diff --git a/version.h b/version.h
index a4d28c5fcd..4a24495fb3 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-06-09"
+#define RUBY_RELEASE_DATE "2008-06-10"
#define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080609
+#define RUBY_RELEASE_CODE 20080610
#define RUBY_PATCHLEVEL 5000
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 7
#define RUBY_RELEASE_YEAR 2008
#define RUBY_RELEASE_MONTH 6
-#define RUBY_RELEASE_DAY 9
+#define RUBY_RELEASE_DAY 10
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];