summaryrefslogtreecommitdiffstats
path: root/ext/iconv
diff options
context:
space:
mode:
authorko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-12-31 15:02:22 +0000
committerko1 <ko1@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-12-31 15:02:22 +0000
commit4ef881bd15c9c4e2e9b20da2c091e80d4d530119 (patch)
tree7b725552a9a4ded93849ca2faab1b257f7761790 /ext/iconv
parent182520b0acc5eea4da52bc8734dc5e3280ce5f94 (diff)
downloadruby-4ef881bd15c9c4e2e9b20da2c091e80d4d530119.tar.gz
ruby-4ef881bd15c9c4e2e9b20da2c091e80d4d530119.tar.xz
ruby-4ef881bd15c9c4e2e9b20da2c091e80d4d530119.zip
* Merge YARV
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11439 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/iconv')
-rw-r--r--ext/iconv/iconv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c
index 0a5d0dfac..be9821130 100644
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@@ -302,7 +302,7 @@ iconv_fail(VALUE error, VALUE success, VALUE failed, struct iconv_env_t* env, co
}
error = rb_class_new_instance(3, args, error);
if (!rb_block_given_p()) rb_exc_raise(error);
- ruby_errinfo = error;
+ rb_set_errinfo(error);
return rb_yield(failed);
}