diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-11 22:39:54 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-11 22:39:54 +0000 |
| commit | 8130e821357852736f3e3cfed47ddab40c6b7b82 (patch) | |
| tree | 488967e56cc75e852af1a7e120e2f2582da88726 | |
| parent | 3a966148128d7b86184a1415b74a904f71fc98c6 (diff) | |
| download | ruby-8130e821357852736f3e3cfed47ddab40c6b7b82.tar.gz ruby-8130e821357852736f3e3cfed47ddab40c6b7b82.tar.xz ruby-8130e821357852736f3e3cfed47ddab40c6b7b82.zip | |
* 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
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | encoding.c | 4 |
2 files changed, 8 insertions, 2 deletions
@@ -1,3 +1,9 @@ +Wed Aug 12 07:38:12 2009 NARUSE, Yui <naruse@ruby-lang.org> + + * encoding.c (is_data_encoding): fix condition. + + * encoding.c (enc_capable): ditto. + Tue Aug 11 23:12:31 2009 Tadayoshi Funaba <tadf@dotrb.org> * 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; } |