(CHAR_TO_CHARC): New inline function.

[chise/xemacs-chise.git-] / src / mule-wnnfns.c

diff --git a/src/mule-wnnfns.c b/src/mule-wnnfns.c
index 6fc8662..50d2840 100644 (file)
--- a/src/mule-wnnfns.c
+++ b/src/mule-wnnfns.c
@@ -271,11 +271,7 @@ Boston, MA 02111-1307, USA.  */
 #include "sysdep.h"
 
 #include "wnn/commonhd.h"
-#ifdef CHAR_IS_UCS4
 #include "character.h"
-#else
-#include "mule-charset.h"
-#endif
 #include "wnn/jllib.h"
 #include "wnn/cplib.h"
 
@@ -1879,10 +1875,23 @@ syms_of_mule_wnn (void)
 }
 
 void
-vars_of_mule_wnn (void)
+reinit_vars_of_mule_wnn (void)
 {
   int i;
 
+  for (i = 0; i < NSERVER; i++)
+    {
+      wnnfns_buf[i] = (struct wnn_buf *) 0;
+      wnnfns_env_norm[i] = (struct wnn_env *) 0;
+      wnnfns_env_rev[i] = (struct wnn_env *) 0;
+    }
+}
+
+void
+vars_of_mule_wnn (void)
+{
+  reinit_vars_of_mule_wnn ();
+
   DEFVAR_INT ("lb-sisheng", &lb_sisheng /*
 Leading character for Sisheng.
 */ );
@@ -1905,13 +1914,6 @@ Leading character for Sisheng.
 
   Vwnn_uniq_level = Qwnn_uniq;
 
-  for (i = 0; i < NSERVER; i++)
-    {
-      wnnfns_buf[i] = (struct wnn_buf *) 0;
-      wnnfns_env_norm[i] = (struct wnn_env *) 0;
-      wnnfns_env_rev[i] = (struct wnn_env *) 0;
-    }
-
   Fprovide(intern("wnn"));
 }