From 8130e821357852736f3e3cfed47ddab40c6b7b82 Mon Sep 17 00:00:00 2001 From: naruse Date: Tue, 11 Aug 2009 22:39:54 +0000 Subject: * encoding.c (is_data_encoding): fix condition. * encoding.c (enc_capable): ditto. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@24505 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ encoding.c | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e571d750e..62bcbdd76 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Wed Aug 12 07:38:12 2009 NARUSE, Yui + + * encoding.c (is_data_encoding): fix condition. + + * encoding.c (enc_capable): ditto. + Tue Aug 11 23:12:31 2009 Tadayoshi Funaba * lib/date.rb (complete_frags): Monday must be suitable for %W's diff --git a/encoding.c b/encoding.c index 930c3007d..42b2475f4 100644 --- a/encoding.c +++ b/encoding.c @@ -62,7 +62,7 @@ static const rb_data_type_t encoding_data_type = { "encoding", 0, 0, enc_memsize, }; -#define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) != &encoding_data_type) +#define is_data_encoding(obj) (RTYPEDDATA_P(obj) && RTYPEDDATA_TYPE(obj) == &encoding_data_type) static VALUE enc_new(rb_encoding *encoding) @@ -585,7 +585,7 @@ enc_capable(VALUE obj) case T_FILE: return TRUE; case T_DATA: - if (!is_data_encoding(obj)) return TRUE; + if (is_data_encoding(obj)) return TRUE; default: return FALSE; } -- cgit