# HG changeset patch
# User james
# Date 1095260659 0
# Node ID de0e5e7132db79f9756ee606c55c9232fd266af0
# Parent  445bd1969ed0a287b21cffddf272cf8a3f176df2
[xemacs-hg @ 2004-09-15 15:04:15 by james]
Use the latest Canna wide character interface.

diff -r 445bd1969ed0 -r de0e5e7132db src/ChangeLog
--- a/src/ChangeLog	Wed Sep 15 08:30:27 2004 +0000
+++ b/src/ChangeLog	Wed Sep 15 15:04:19 2004 +0000
@@ -1,3 +1,12 @@
+2004-09-14  Jerry James  <james@xemacs.org>
+
+	* mule-canna.c (CANNA_NEW_WCHAR_AWARE): Define to use new wchar
+	interface.
+	* mule-canna.c (call_Fding): Return an int to match the jrBeepFunc
+	prototype.
+	* mule-canna.c (Fcanna_initialize): The jrBeepFunc prototype is
+	now given in the Canna headers.
+
 2004-09-14  Jerry James  <james@xemacs.org>
 
 	* gifrlib.h: Remove redundant extern declarations.
diff -r 445bd1969ed0 -r de0e5e7132db src/mule-canna.c
--- a/src/mule-canna.c	Wed Sep 15 08:30:27 2004 +0000
+++ b/src/mule-canna.c	Wed Sep 15 15:04:19 2004 +0000
@@ -159,11 +159,13 @@
 
 #ifdef CANNA2
 #define IROHA_BC
+#define CANNA_NEW_WCHAR_AWARE
 #include "canna/jrkanji.h"
 #include "canna/RK.h"
 #else /* !CANNA2 */
 #include "iroha/jrkanji.h"
 #include "iroha/RK.h"
+extern int (*jrBeepFunc) (void);
 #endif /* !CANNA2 */
 extern char *jrKanjiError;
 
@@ -339,10 +341,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, /*
@@ -435,8 +438,6 @@
     }
   else
     {
-      extern void (*jrBeepFunc) (void);
-
       jrBeepFunc = call_Fding;
 
 #ifdef KC_SETAPPNAME