diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/iconv/iconv.c | 2 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 9 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Sun May 16 10:49:47 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/iconv/iconv.c (rb_iconv_sys_fail): fix number of arguments. + a patch by Masaya TARUI <tarui AT prx.jp>. + Sat May 15 17:16:15 2010 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/iconv/iconv.c (rb_iconv_sys_fail): raise BrokenLibrary if diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index e3a64c3bc3..677c10e3ad 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -151,7 +151,7 @@ static void rb_iconv_sys_fail(const char *s) { if (errno == 0) { - rb_raise(rb_eIconvBrokenLibrary, "%s", s); + rb_exc_raise(iconv_fail(rb_eIconvBrokenLibrary, Qnil, Qnil, NULL, s)); } rb_sys_fail(s); } @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.8.8" -#define RUBY_RELEASE_DATE "2010-05-15" +#define RUBY_RELEASE_DATE "2010-05-16" #define RUBY_VERSION_CODE 188 -#define RUBY_RELEASE_CODE 20100515 +#define RUBY_RELEASE_CODE 20100516 #define RUBY_PATCHLEVEL -1 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 8 #define RUBY_RELEASE_YEAR 2010 #define RUBY_RELEASE_MONTH 5 -#define RUBY_RELEASE_DAY 15 +#define RUBY_RELEASE_DAY 16 #define NO_STRING_LITERAL_CONCATENATION 1 #ifdef RUBY_EXTERN |