* encoding.c (enc_init_db): moved to enc/encdb.c.

* transcode.c (init_transcoder_table): moved to enc/trans/transdb.c.

* enc/depend (enc/encdb.o enc/trans/transdb.o): depend on
  corresponding headers.

* common.mk (COMMONOBJS): moved transcode.o from OBJS


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15915 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 40 deletions

diff --git a/encoding.c b/encoding.c
index 9759da79a4..e243451569 100644
--- a/encoding.c
+++ b/encoding.c
@@ -34,29 +34,7 @@ static struct {
 
 void rb_enc_init(void);
 
-#ifndef NO_ENCDB_H
-#undef ENC_REPLICATE
-#undef ENC_ALIAS
-#undef ENC_DUMMY
-static int encdb_replicate(const char *alias, const char *orig);
-static int encdb_alias(const char *alias, const char *orig);
-static int encdb_dummy(const char *name);
-static void encdb_declare(const char *name);
-#define ENC_REPLICATE(name, orig) encdb_replicate(name, orig)
-#define ENC_ALIAS(name, orig) encdb_alias(name, orig)
-#define ENC_DUMMY(name) encdb_dummy(name)
-#define ENC_DEFINE(name) encdb_declare(name)
-#endif
-
-static void
-enc_init_db(void)
-{
-#ifdef NO_ENCDB_H
 #define ENCODING_COUNT ENCINDEX_BUILTIN_MAX
-#else
-#include "encdb.h"
-#endif
-}
 
 #define enc_autoload_p(enc) (!rb_enc_mbmaxlen(enc))
 
@@ -251,9 +229,8 @@ rb_enc_register(const char *name, rb_encoding *encoding)
     return index;
 }
 
-#ifndef NO_ENCDB_H
-static void
-encdb_declare(const char *name)
+void
+rb_encdb_declare(const char *name)
 {
     int idx = rb_enc_registered(name);
     if (idx < 0) {
@@ -261,7 +238,6 @@ encdb_declare(const char *name)
     }
     set_encoding_const(name, rb_enc_from_index(idx));
 }
-#endif
 
 static void
 enc_check_duplication(const char *name)
@@ -293,7 +269,6 @@ rb_enc_replicate(const char *name, rb_encoding *encoding)
     return idx;
 }
 
-#ifndef NO_ENCDB_H
 static int
 enc_replicate(int idx, const char *name, rb_encoding *origenc)
 {
@@ -310,8 +285,8 @@ enc_replicate(int idx, const char *name, rb_encoding *origenc)
     return idx;
 }
 
-static int
-encdb_replicate(const char *name, const char *orig)
+int
+rb_encdb_replicate(const char *name, const char *orig)
 {
     int origidx = rb_enc_registered(orig);
     int idx = rb_enc_registered(name);
@@ -321,7 +296,6 @@ encdb_replicate(const char *name, const char *orig)
     }
     return enc_replicate(idx, name, rb_enc_from_index(origidx));
 }
-#endif
 
 int
 rb_define_dummy_encoding(const char *name)
@@ -333,9 +307,8 @@ rb_define_dummy_encoding(const char *name)
     return index;
 }
 
-#ifndef NO_ENCDB_H
-static int
-encdb_dummy(const char *name)
+int
+rb_encdb_dummy(const char *name)
 {
     int index = enc_replicate(rb_enc_registered(name), name,
 			      rb_ascii8bit_encoding());
@@ -344,7 +317,6 @@ encdb_dummy(const char *name)
     ENC_SET_DUMMY(enc);
     return index;
 }
-#endif
 
 int
 rb_enc_dummy_p(rb_encoding *enc)
@@ -398,9 +370,8 @@ rb_enc_alias(const char *alias, const char *orig)
     return enc_alias(alias, idx);
 }
 
-#ifndef NO_ENCDB_H
-static int
-encdb_alias(const char *alias, const char *orig)
+int
+rb_encdb_alias(const char *alias, const char *orig)
 {
     int idx = rb_enc_registered(orig);
 
@@ -409,7 +380,6 @@ encdb_alias(const char *alias, const char *orig)
     }
     return enc_alias(alias, idx);
 }
-#endif
 
 enum {
     ENCINDEX_ASCII,
@@ -1225,8 +1195,6 @@ Init_Encoding(void)
 
     rb_define_singleton_method(rb_cEncoding, "default_external", get_default_external, 0);
     rb_define_singleton_method(rb_cEncoding, "locale_charmap", rb_locale_charmap, 0);
-
-    enc_init_db();
 }
 
 /* locale insensitive functions */