diff options
| author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 04:26:38 +0000 |
|---|---|---|
| committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2007-12-21 04:26:38 +0000 |
| commit | 1b27cfcd6ca0bcf7b75be27de4746cd030b7c1d4 (patch) | |
| tree | b921c8618fbacd59c47fba4d80935edc41659c12 /encoding.c | |
| parent | 65a953c7c9527e32aa3024322bde24864a3a66cb (diff) | |
* io.c (rb_io_external_encoding): new method.
* encoding.c (rb_enc_from_encoding): returns Qnil for NULL
encoding.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14397 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'encoding.c')
| -rw-r--r-- | encoding.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/encoding.c b/encoding.c index 1af3c4422c..6ff8fb6aad 100644 --- a/encoding.c +++ b/encoding.c @@ -51,7 +51,7 @@ enc_new(rb_encoding *encoding) VALUE rb_enc_from_encoding(rb_encoding *encoding) { - if (!encoding) return 0; + if (!encoding) return Qnil; if (enc_initialized_p(encoding)) return ENC_FROM_ENCODING(encoding); return enc_new(encoding); |