summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--encoding.c4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index e571d750ec..62bcbdd766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 930c3007d4..42b2475f41 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;
}