diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-10 04:40:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-06-10 04:40:40 +0000 |
| commit | 397ee1a31500368f9e06b47ec5da3ca9054bd751 (patch) | |
| tree | 3324905a8f40d34fd81696394704112b645fe805 | |
| parent | 5007c3461953e6ead84e69863b435c3c60e15bdb (diff) | |
* eval.c (rb_thread_select), string.c (str_gsub): suppress warnings.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@17070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | eval.c | 2 | ||||
| -rw-r--r-- | string.c | 4 | ||||
| -rw-r--r-- | version.h | 6 |
4 files changed, 9 insertions, 7 deletions
@@ -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. @@ -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; @@ -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) { @@ -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[]; |
