summaryrefslogtreecommitdiff
path: root/include/ruby/encoding.h
diff options
context:
space:
mode:
authorakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-09 12:22:43 +0000
committerakr <akr@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-09-09 12:22:43 +0000
commitd456f7e357f8259bd4b73c1cdac74add216e4746 (patch)
tree505ccb392766873db78fbf542fa78a6718076951 /include/ruby/encoding.h
parenta729be8433c2b1fb1057ca04d99b7408dd7d25a0 (diff)
* include/ruby/encoding.h (ECONV_DECORATOR_MASK): merge
ECONV_ENCODER_MASK and ECONV_DECORATOR_MASK. (ECONV_UNIVERSAL_NEWLINE_DECORATOR): renamed from ECONV_UNIVERSAL_NEWLINE_DECODER. (ECONV_CRLF_NEWLINE_DECORATOR): renamed from ECONV_CRLF_NEWLINE_ENCODER. (ECONV_CR_NEWLINE_DECORATOR): renamed from ECONV_CR_NEWLINE_ENCODER. (ECONV_XML_TEXT_DECORATOR): renamed from ECONV_XML_TEXT_ENCODER. (ECONV_XML_ATTR_CONTENT_DECORATOR): renamed from ECONV_XML_ATTR_CONTENT_ENCODER. (ECONV_STATEFUL_DECORATOR_MASK): renamed from ECONV_STATEFUL_ENCODER_MASK. (ECONV_XML_ATTR_QUOTE_DECORATOR): renamed from ECONV_XML_ATTR_CONTENT_DECORATOR. * io.c: follow the renaming. * transcode.c: ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19271 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'include/ruby/encoding.h')
-rw-r--r--include/ruby/encoding.h23
1 files changed, 10 insertions, 13 deletions
diff --git a/include/ruby/encoding.h b/include/ruby/encoding.h
index 49ec29ac86..ed65e59fdb 100644
--- a/include/ruby/encoding.h
+++ b/include/ruby/encoding.h
@@ -265,19 +265,16 @@ void rb_econv_binmode(rb_econv_t *ec);
#define ECONV_UNDEF_REPLACE 0x00000020
#define ECONV_UNDEF_HEX_CHARREF 0x00000030
-/* usable only if destination encoding is ascii compatible */
-#define ECONV_DECODER_MASK 0x00000f00
-#define ECONV_UNIVERSAL_NEWLINE_DECODER 0x00000100
-
-/* usable only if source encoding is ascii compatible */
-#define ECONV_ENCODER_MASK 0x0000f000
-#define ECONV_CRLF_NEWLINE_ENCODER 0x00001000
-#define ECONV_CR_NEWLINE_ENCODER 0x00002000
-#define ECONV_XML_TEXT_ENCODER 0x00004000
-#define ECONV_XML_ATTR_CONTENT_ENCODER 0x00008000
-
-#define ECONV_STATEFUL_ENCODER_MASK 0x00f00000
-#define ECONV_XML_ATTR_QUOTE_ENCODER 0x00100000
+#define ECONV_DECORATOR_MASK 0x0000ff00
+
+#define ECONV_UNIVERSAL_NEWLINE_DECORATOR 0x00000100
+#define ECONV_CRLF_NEWLINE_DECORATOR 0x00001000
+#define ECONV_CR_NEWLINE_DECORATOR 0x00002000
+#define ECONV_XML_TEXT_DECORATOR 0x00004000
+#define ECONV_XML_ATTR_CONTENT_DECORATOR 0x00008000
+
+#define ECONV_STATEFUL_DECORATOR_MASK 0x00f00000
+#define ECONV_XML_ATTR_QUOTE_DECORATOR 0x00100000
/* end of flags for rb_econv_open */