(mdatabase__finder, mdatabase__loader): Delete them.

(m17n_init_core): Call mdatabase__init.

diff --git a/src/m17n-core.c b/src/m17n-core.c
index f3744da..44c791d 100644 (file)
--- a/src/m17n-core.c
+++ b/src/m17n-core.c
@@ -416,10 +416,6 @@ int m17n__core_initialized;
 int m17n__shell_initialized;
 int m17n__gui_initialized;
 
-void *(*mdatabase__finder) (MSymbol tag1, MSymbol tag2,
-                          MSymbol tag3, MSymbol tag4);
-void *(*mdatabase__loader) (void *);
-
 int mdebug__flags[MDEBUG_MAX];
 FILE *mdebug__output;
 
@@ -565,14 +561,12 @@ m17n_init_core (void)
   if  (mchartable__init () < 0)
     goto err;
   MDEBUG_PRINT_TIME ("INIT", (stderr, " to initialize chartable module."));
-  if (mtext__init () < 0)
-    goto err;
-  if (mtext__prop_init () < 0)
+  if (mtext__init () < 0 || mtext__prop_init () < 0)
     goto err;
   MDEBUG_PRINT_TIME ("INIT", (stderr, " to initialize mtext module."));
-
-  mdatabase__finder = NULL;
-  mdatabase__loader = NULL;
+  if (mdatabase__init () < 0)
+    goto err;
+  MDEBUG_PRINT_TIME ("INIT", (stderr, " to initialize database module."));
 
 #if ENABLE_NLS
   bindtextdomain ("m17n-lib", GETTEXTDIR);