diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | dmyencoding.c | 1 | ||||
| -rw-r--r-- | encoding.c | 2 | ||||
| -rw-r--r-- | internal.h | 2 |
4 files changed, 3 insertions, 6 deletions
@@ -1,4 +1,6 @@ -Mon Jul 15 02:32:04 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> +Mon Jul 15 02:32:58 2013 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * encoding.c (rb_enc_init): no longer needs NO_PRESERVED_ENCODING. * encoding.c (enc_inspect): defer loading autoloaded encoding. diff --git a/dmyencoding.c b/dmyencoding.c index 99a727eb62..1bd1106e69 100644 --- a/dmyencoding.c +++ b/dmyencoding.c @@ -1,3 +1,2 @@ #define NO_LOCALE_CHARMAP 1 -#define NO_PRESERVED_ENCODING 1 #include "encoding.c" diff --git a/encoding.c b/encoding.c index dc13fc924a..1d17e05e14 100644 --- a/encoding.c +++ b/encoding.c @@ -564,7 +564,6 @@ rb_enc_init(void) ENC_REGISTER(UTF_8); ENC_REGISTER(US_ASCII); #undef ENC_REGISTER -#ifndef NO_PRESERVED_ENCODING #define ENCDB_REGISTER(name, enc) enc_register_at(ENCINDEX_##enc, name, NULL) ENCDB_REGISTER("UTF-16BE", UTF_16BE); ENCDB_REGISTER("UTF-16LE", UTF_16LE); @@ -577,7 +576,6 @@ rb_enc_init(void) ENCDB_REGISTER("EUC-JP", EUC_JP); ENCDB_REGISTER("Windows-31J", Windows_31J); #undef ENCDB_REGISTER -#endif enc_table.count = ENCINDEX_BUILTIN_MAX; } diff --git a/internal.h b/internal.h index a8243a793f..feb51cf8a8 100644 --- a/internal.h +++ b/internal.h @@ -205,7 +205,6 @@ enum ruby_preserved_encindex { ENCINDEX_UTF_8, ENCINDEX_US_ASCII, -#ifndef NO_PRESERVED_ENCODING /* preserved indexes */ ENCINDEX_UTF_16BE, ENCINDEX_UTF_16LE, @@ -218,7 +217,6 @@ enum ruby_preserved_encindex { /* for old options of regexp */ ENCINDEX_EUC_JP, ENCINDEX_Windows_31J, -#endif ENCINDEX_BUILTIN_MAX }; |