Mercurial > hg > xemacs-beta

diff modules/canna/canna_api.c @ 3830:e58f4b9ab1ad
[xemacs-hg @ 2007-02-15 16:11:52 by stephent] Adapt canna autodetection to current reality. <878xeze6qj.fsf@uwakimon.sk.tsukuba.ac.jp>
author: stephent
date: Thu, 15 Feb 2007 16:12:19 +0000
parents: a80f978d8342
children: f9be867eb83e
--- a/modules/canna/canna_api.c	Wed Feb 14 22:51:17 2007 +0000
+++ b/modules/canna/canna_api.c	Thu Feb 15 16:12:19 2007 +0000
@@ -161,17 +161,14 @@
 #include "buffer.h"
 #include "file-coding.h"
 
-#ifdef CANNA2
+/* iroha (Canna v1) support removed as of canna_api.c r1.4.
+   #### Is the IROHA_BC #define needed? */
 #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"
-#endif /* !CANNA2 */
+
+/* #### These shouldn't be needed any more. */
 extern char *jrKanjiError;
-
 extern int (*jrBeepFunc) (void);
 
 /* #### is this global really necessary? */