diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-21 02:54:17 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-12-21 02:54:17 +0000 |
| commit | 139973f60271d3fd0b97fc4cf080183e15ebb67e (patch) | |
| tree | 83fa4ef9970b7cae82fd55da6c728d7a2d8c4c80 /ext/iconv/iconv.c | |
| parent | e8ed175fe02aecab21ce50e85e27fe79137d8c31 (diff) | |
* ext/openssl/ossl_asn1.c (ossl_asn1_traverse): [ruby-dev:25261]
* ext/openssl/ossl_asn1.c (ossl_asn1_decode): ditto.
* ext/openssl/ossl_asn1.c (ossl_asn1_decode_all): ditto.
* struct.c (make_struct): [ruby-dev:25249]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@7618 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext/iconv/iconv.c')
| -rw-r--r-- | ext/iconv/iconv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/iconv/iconv.c b/ext/iconv/iconv.c index 29ab2c7d7b..c395373ff2 100644 --- a/ext/iconv/iconv.c +++ b/ext/iconv/iconv.c @@ -732,7 +732,7 @@ iconv_iconv return iconv_convert(VALUE2ICONV(cd), str, NIL_P(n1) ? 0 : NUM2INT(n1), - NIL_P(n2) ? -1 : NUM2INT(n1), + NIL_P(n2) ? -1 : NUM2INT(n2), NULL); } |