--- xemacs-21.4.14/src/mule-canna.c.old	Fri Apr 13 03:24:03 2001
+++ xemacs-21.4.14/src/mule-canna.c	Mon Dec  8 03:14:47 2003
@@ -157,6 +157,11 @@
 #include "buffer.h"
 #include "file-coding.h"
 
+#define CANNA3_7
+#ifdef CANNA3_7
+# define CANNA_NEW_WCHAR_AWARE
+#endif
+
 #ifdef CANNA2
 #define IROHA_BC
 #include "canna/jrkanji.h"
@@ -165,7 +170,9 @@
 #include "iroha/jrkanji.h"
 #include "iroha/RK.h"
 #endif /* !CANNA2 */
+#ifndef CANNA3_7
 extern char *jrKanjiError;
+#endif
 
 /* #### is this global really necessary? */
 #define KEYTOSTRSIZE 2048
@@ -337,10 +344,11 @@
 }
 
 /* For whatever reason, calling Fding directly from libCanna loses */
-static void
+static int
 call_Fding (void)
 {
   Fding (Qnil, Qnil, Qnil);
+  return 0;
 }
 
 DEFUN ("canna-initialize", Fcanna_initialize, 0, 3, 0, /*
@@ -431,15 +439,17 @@
     }
   else
     {
-      extern void (*jrBeepFunc) (void);
+#ifndef CANNA_JR_BEEP_FUNC_DECLARED
+      extern int (*jrBeepFunc) (void);
+#endif
 
       jrBeepFunc = call_Fding;
 
 #ifdef KC_SETAPPNAME
 #ifndef CANNA_MULE
-      wcKanjiControl (0, KC_SETAPPNAME, "nemacs");
+      jrKanjiControl (0, KC_SETAPPNAME, "nemacs");
 #else /* CANNA_MULE */
-      wcKanjiControl (0, KC_SETAPPNAME, "mule");
+      jrKanjiControl (0, KC_SETAPPNAME, "mule");
 #endif /* CANNA_MULE */
 #endif /* KC_SETAPPNAME */