nobu	2013-07-15 02:33:02 +0900 (Mon, 15 Jul 2013)

  New Revision: 41970

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=41970

  Log:
    encoding.c: NO_PRESERVED_ENCODING
    
    * encoding.c (rb_enc_init): no longer needs NO_PRESERVED_ENCODING.

  Modified files:
    trunk/ChangeLog
    trunk/dmyencoding.c
    trunk/encoding.c
    trunk/internal.h

Index: encoding.c
===================================================================
--- encoding.c	(revision 41969)
+++ encoding.c	(revision 41970)
@@ -564,7 +564,6 @@ rb_enc_init(void) https://github.com/ruby/ruby/blob/trunk/encoding.c#L564
     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) https://github.com/ruby/ruby/blob/trunk/encoding.c#L576
     ENCDB_REGISTER("EUC-JP", EUC_JP);
     ENCDB_REGISTER("Windows-31J", Windows_31J);
 #undef ENCDB_REGISTER
-#endif
     enc_table.count = ENCINDEX_BUILTIN_MAX;
 }
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 41969)
+++ ChangeLog	(revision 41970)
@@ -1,4 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
-Mon Jul 15 02:32:04 2013  Nobuyoshi Nakada  <nobu@r...>
+Mon Jul 15 02:32:58 2013  Nobuyoshi Nakada  <nobu@r...>
+
+	* encoding.c (rb_enc_init): no longer needs NO_PRESERVED_ENCODING.
 
 	* encoding.c (enc_inspect): defer loading autoloaded encoding.
 
Index: dmyencoding.c
===================================================================
--- dmyencoding.c	(revision 41969)
+++ dmyencoding.c	(revision 41970)
@@ -1,3 +1,2 @@ https://github.com/ruby/ruby/blob/trunk/dmyencoding.c#L1
 #define NO_LOCALE_CHARMAP 1
-#define NO_PRESERVED_ENCODING 1
 #include "encoding.c"
Index: internal.h
===================================================================
--- internal.h	(revision 41969)
+++ internal.h	(revision 41970)
@@ -205,7 +205,6 @@ enum ruby_preserved_encindex { https://github.com/ruby/ruby/blob/trunk/internal.h#L205
     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 { https://github.com/ruby/ruby/blob/trunk/internal.h#L217
     /* for old options of regexp */
     ENCINDEX_EUC_JP,
     ENCINDEX_Windows_31J,
-#endif
 
     ENCINDEX_BUILTIN_MAX
 };

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/