From 1b27cfcd6ca0bcf7b75be27de4746cd030b7c1d4 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Fri, 21 Dec 2007 04:26:38 +0000
Subject: * 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
---
 encoding.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'encoding.c')

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);
-- 
cgit v1.2.3