From 01eda82dbf451d7469010ba2446e0871dcea344b Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Sat, 12 Nov 2005 21:25:31 +0000
Subject: [PATCH] Missing return types, illegal conversion all over the place.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14875 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../methods/canna/CannaLooper.cpp             |   2 +
 .../methods/canna/KouhoWindow.cpp             |   2 +
 .../input_server/methods/canna/lib/RKkana.c   |   8 +-
 .../input_server/methods/canna/lib/bunmap.h   |  10 +-
 .../input_server/methods/canna/lib/bushu.c    |  51 +--
 .../input_server/methods/canna/lib/canna.h    |   4 +-
 .../input_server/methods/canna/lib/chikuji.c  |   9 +-
 .../methods/canna/lib/defaultmap.c            |   8 +-
 .../input_server/methods/canna/lib/ebind.c    |   6 +-
 .../input_server/methods/canna/lib/empty.c    |  75 +++--
 .../input_server/methods/canna/lib/engine.c   |   3 +-
 .../input_server/methods/canna/lib/henkan.c   |  74 ++---
 .../input_server/methods/canna/lib/hex.c      |  18 +-
 .../input_server/methods/canna/lib/ichiran.c  | 176 +++++-----
 .../methods/canna/lib/ichiranmap.h            |   4 +-
 .../input_server/methods/canna/lib/jishu.c    | 144 ++++----
 .../input_server/methods/canna/lib/jishumap.h |   4 +-
 .../input_server/methods/canna/lib/jrbind.c   |   8 +-
 .../input_server/methods/canna/lib/kctrl.c    | 178 +++++-----
 .../input_server/methods/canna/lib/keydef.c   |  18 +-
 .../input_server/methods/canna/lib/kigo.c     |  58 ++--
 .../input_server/methods/canna/lib/kigomap.h  |   7 +-
 .../input_server/methods/canna/lib/lisp.c     | 256 +++++++-------
 .../input_server/methods/canna/lib/mode.c     |  12 +-
 .../input_server/methods/canna/lib/multi.c    |  10 +-
 .../input_server/methods/canna/lib/onoff.c    |  19 +-
 .../input_server/methods/canna/lib/onoffmap.h |   2 +-
 .../input_server/methods/canna/lib/parse.c    |   8 +-
 .../input_server/methods/canna/lib/romaji.c   | 314 +++++++++---------
 .../input_server/methods/canna/lib/t_reimap.h |   4 +-
 .../input_server/methods/canna/lib/tanmap.h   |   4 +-
 .../input_server/methods/canna/lib/uiutil.c   |  18 +-
 .../input_server/methods/canna/lib/uldefine.c | 102 +++---
 .../input_server/methods/canna/lib/uldelete.c |  93 +++---
 .../input_server/methods/canna/lib/ulhinshi.c |  68 ++--
 .../input_server/methods/canna/lib/ulkigo.c   |  44 +--
 .../input_server/methods/canna/lib/ulmount.c  |  26 +-
 .../input_server/methods/canna/lib/ulserver.c |  16 +-
 .../input_server/methods/canna/lib/util.c     |  40 +--
 .../input_server/methods/canna/lib/yesno.c    |  14 +-
 .../input_server/methods/canna/rk/bun.c       |  10 +-
 .../input_server/methods/canna/rk/dic.c       |  12 +-
 .../input_server/methods/canna/rk/ngram.c     |   4 +-
 .../input_server/methods/canna/rk/nword.c     |   3 +-
 .../input_server/methods/canna/rk/permdic.c   |   6 +-
 .../input_server/methods/canna/rk/tempdic.c   |  10 +-
 46 files changed, 999 insertions(+), 963 deletions(-)

diff --git a/src/add-ons/input_server/methods/canna/CannaLooper.cpp b/src/add-ons/input_server/methods/canna/CannaLooper.cpp
index 58c2674d0b..324a3af375 100644
--- a/src/add-ons/input_server/methods/canna/CannaLooper.cpp
+++ b/src/add-ons/input_server/methods/canna/CannaLooper.cpp
@@ -8,6 +8,8 @@
 //	(c) 1999 M.Kawamura
 //
 
+#include <string.h>
+
 #include <Input.h>
 #include <Screen.h>
 #include <Menu.h>
diff --git a/src/add-ons/input_server/methods/canna/KouhoWindow.cpp b/src/add-ons/input_server/methods/canna/KouhoWindow.cpp
index 6c111c5ce3..6a350bcb15 100644
--- a/src/add-ons/input_server/methods/canna/KouhoWindow.cpp
+++ b/src/add-ons/input_server/methods/canna/KouhoWindow.cpp
@@ -7,6 +7,8 @@
 //	(c) 1999 M.Kawamura
 //
 
+#include <string.h>
+
 #include <Screen.h>
 #ifdef DEBUG
 #include <Debug.h>
diff --git a/src/add-ons/input_server/methods/canna/lib/RKkana.c b/src/add-ons/input_server/methods/canna/lib/RKkana.c
index bae6453b80..4ee0b8a1ec 100644
--- a/src/add-ons/input_server/methods/canna/lib/RKkana.c
+++ b/src/add-ons/input_server/methods/canna/lib/RKkana.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcsid[]="@(#) 102.1 $Id: RKkana.c,v 1.1 2004/12/23 21:23:48 korli Exp $";
+static char rcsid[]="@(#) 102.1 $Id$";
 #endif
 
 /* LINTLIBRARY */
@@ -698,6 +698,7 @@ RkCvtSuuji(unsigned char *dst, int maxdst, unsigned char *src, int maxsrc, int f
 
 #define CBUFSIZE     512
 
+int
 RkwCvtHan(WCHAR_T *dst, int maxdst, WCHAR_T *src, int srclen)
 {
   int len = 0;
@@ -732,6 +733,7 @@ RkwCvtHan(WCHAR_T *dst, int maxdst, WCHAR_T *src, int srclen)
   return len;
 }
 
+int
 RkwCvtHira(WCHAR_T *dst, int maxdst, WCHAR_T *src, int srclen)
 {
   int len = 0;
@@ -767,6 +769,7 @@ RkwCvtHira(WCHAR_T *dst, int maxdst, WCHAR_T *src, int srclen)
   return len;
 }
   
+int
 RkwCvtKana(WCHAR_T *dst, int maxdst, WCHAR_T *src, int srclen)
 {
   int len = 0;
@@ -801,7 +804,8 @@ RkwCvtKana(WCHAR_T *dst, int maxdst, WCHAR_T *src, int srclen)
 #endif
   return len;
 }
-  
+
+int  
 RkwCvtZen(WCHAR_T *dst, int maxdst, WCHAR_T *src, int srclen)
 {
   int len = 0;
diff --git a/src/add-ons/input_server/methods/canna/lib/bunmap.h b/src/add-ons/input_server/methods/canna/lib/bunmap.h
index a4d2d1381c..f1563d5d6c 100644
--- a/src/add-ons/input_server/methods/canna/lib/bunmap.h
+++ b/src/add-ons/input_server/methods/canna/lib/bunmap.h
@@ -21,11 +21,13 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char bunmap_id[] = "@(#) 102.1 $Id: bunmap.h,v 1.1 2004/12/23 21:23:48 korli Exp $";
+static char bunmap_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
-extern DoFuncSequence(),UseOtherKeymap();
-extern TanNop (uiContext), YomiKakutei (uiContext);
+extern int DoFuncSequence();
+extern int UseOtherKeymap();
+extern int TanNop (uiContext);
+extern int YomiKakutei (uiContext);
 
 static struct funccfunc bun_funcs[] = {
   {CANNA_FN_FunctionalInsert	,BunSelfInsert		},
@@ -50,7 +52,7 @@ static struct funccfunc bun_funcs[] = {
   {0				,0			},
 };
 
-extern searchfunc(...);
+extern int searchfunc(...);
 KanjiModeRec bunsetsu_mode = {
   searchfunc,
   default_kmap,
diff --git a/src/add-ons/input_server/methods/canna/lib/bushu.c b/src/add-ons/input_server/methods/canna/lib/bushu.c
index 89ded1a8ab..328ded428b 100644
--- a/src/add-ons/input_server/methods/canna/lib/bushu.c
+++ b/src/add-ons/input_server/methods/canna/lib/bushu.c
@@ -25,7 +25,7 @@
 /************************************************************************/
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: bushu.c,v 1.1 2004/12/23 21:23:48 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include	<errno.h>
@@ -202,15 +202,15 @@ char *bushu_skey[] =
 
 
 static forichiranContext newForIchiranContext(void);
-static vBushuMode(uiContext d, int major_mode);
-static vBushuIchiranQuitCatch(uiContext d, int retval, mode_context env);
-static vBushuExitCatch(uiContext d, int retval, mode_context env);
-static bushuEveryTimeCatch(uiContext d, int retval, mode_context env);
-static bushuExitCatch(uiContext d, int retval, mode_context env);
-static bushuQuitCatch(uiContext d, int retval, mode_context env);
-static convBushuQuitCatch(uiContext d, int retval, mode_context env);
-static bushuHenkan(uiContext d, int flag, int ext, int cur, int (*quitfunc )(uiContext, int, mode_context ));
-static makeBushuIchiranQuit(uiContext d, int flag);
+static int vBushuMode(uiContext d, int major_mode);
+static int vBushuIchiranQuitCatch(uiContext d, int retval, mode_context env);
+static int vBushuExitCatch(uiContext d, int retval, mode_context env);
+static int bushuEveryTimeCatch(uiContext d, int retval, mode_context env);
+static int bushuExitCatch(uiContext d, int retval, mode_context env);
+static int bushuQuitCatch(uiContext d, int retval, mode_context env);
+static int convBushuQuitCatch(uiContext d, int retval, mode_context env);
+static int bushuHenkan(uiContext d, int flag, int ext, int cur, int (*quitfunc )(uiContext, int, mode_context ));
+static int makeBushuIchiranQuit(uiContext d, int flag);
 
 static WCHAR_T *bushu_char[BUSHU_CNT];
 static WCHAR_T *bushu_key[BUSHU_CNT];
@@ -283,6 +283,7 @@ newForIchiranContext(void)
   return fcxt;
 }
 
+int
 getForIchiranContext(uiContext d)
 {
   forichiranContext fc;
@@ -326,7 +327,7 @@ popForIchiranMode(uiContext d)
  * Éô¼ó¥â¡¼¥ÉÆþÎÏ                                                            *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-static
+static int
 vBushuMode(uiContext d, int major_mode)
 {
   forichiranContext fc;
@@ -381,7 +382,7 @@ vBushuMode(uiContext d, int major_mode)
   return(retval);
 }
 
-static
+static int
 vBushuIchiranQuitCatch(uiContext d, int retval, mode_context env)
      /* ARGSUSED */
 {
@@ -398,7 +399,7 @@ vBushuIchiranQuitCatch(uiContext d, int retval, mode_context env)
   return(vBushuMode(d, CANNA_MODE_BushuMode));
 }
 
-static
+static int
 vBushuExitCatch(uiContext d, int retval, mode_context env)
      /* ARGSUSED */
 {
@@ -421,6 +422,7 @@ vBushuExitCatch(uiContext d, int retval, mode_context env)
   return res;
 }
 
+int
 BushuMode(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -438,9 +440,9 @@ BushuMode(uiContext d)
  * Éô¼ó¥â¡¼¥ÉÆþÎϤΰìÍ÷ɽ¼¨                                                  *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-static bushuEveryTimeCatch (uiContext, int, mode_context);
+static int bushuEveryTimeCatch (uiContext, int, mode_context);
 
-static
+static int
 bushuEveryTimeCatch(uiContext d, int retval, mode_context env)
      /* ARGSUSED */
 {
@@ -449,9 +451,9 @@ bushuEveryTimeCatch(uiContext d, int retval, mode_context env)
   return(retval);
 }
 
-static bushuExitCatch (uiContext, int, mode_context);
+static int bushuExitCatch (uiContext, int, mode_context);
 
-static
+static int
 bushuExitCatch(uiContext d, int retval, mode_context env)
 {
   yomiContext yc;
@@ -477,7 +479,7 @@ bushuExitCatch(uiContext d, int retval, mode_context env)
 }
 
 #ifndef NO_EXTEND_MENU
-static
+static int
 bushuQuitCatch(uiContext d, int retval, mode_context env)
      /* ARGSUSED */
 {
@@ -501,7 +503,7 @@ bushuQuitCatch(uiContext d, int retval, mode_context env)
  * Éô¼ó¤È¤·¤Æ¤ÎÊÑ´¹¤Î°ìÍ÷ɽ¼¨                                                *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-static
+static int
 convBushuQuitCatch(uiContext d, int retval, mode_context env)
 {
   popCallback(d); /* °ìÍ÷¤ò¥Ý¥Ã¥× */
@@ -528,6 +530,7 @@ convBushuQuitCatch(uiContext d, int retval, mode_context env)
  */
 int ConvertAsBushu (uiContext);
 
+int
 ConvertAsBushu(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -573,7 +576,7 @@ inline int
 bushuBgnBun(RkStat *st, WCHAR_T *yomi, int length)
 {
   int nbunsetsu;
-  extern defaultBushuContext;
+  extern int defaultBushuContext;
 
   /* ϢʸÀáÊÑ´¹¤ò³«»Ï¤¹¤ë *//* ¼­½ñ¤Ë¤¢¤ë¸õÊä¤Î¤ß¼è¤ê½Ð¤¹ */
   if ((defaultBushuContext == -1)) {
@@ -615,7 +618,7 @@ bushuBgnBun(RkStat *st, WCHAR_T *yomi, int length)
  * ¤³¤³¤ËÍè¤ë»þ¤Ï¤Þ¤À getForIchiranContext ¤¬¸Æ¤Ð¤ì¤Æ¤¤¤Ê¤¤¤â¤Î¤È¤¹¤ë
  */
 
-static
+static int
 bushuHenkan(uiContext d, int flag, int ext, int cur, int (*quitfunc )(uiContext, int, mode_context ))
 {
   forichiranContext fc;
@@ -624,7 +627,7 @@ bushuHenkan(uiContext d, int flag, int ext, int cur, int (*quitfunc )(uiContext,
   WCHAR_T *yomi, **allBushuCands;
   RkStat	st;
   int nelem, currentkouho, nbunsetsu, length, retval = 0;
-  extern defaultBushuContext;
+  extern int defaultBushuContext;
   
 
   if(flag) {
@@ -745,10 +748,10 @@ bushuHenkan(uiContext d, int flag, int ext, int cur, int (*quitfunc )(uiContext,
  *			BushuYomiHenkan¤«¤é¸Æ¤Ð¤ì¤¿ 1
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-static
+static int
 makeBushuIchiranQuit(uiContext d, int flag)
 {
-  extern defaultBushuContext;
+  extern int defaultBushuContext;
 
   /* Éô¼óÊÑ´¹¤Ï³Ø½¬¤·¤Ê¤¤¡£ */
   if(RkwEndBun(defaultBushuContext, 0) == -1) { /* 0:³Ø½¬¤·¤Ê¤¤ */
diff --git a/src/add-ons/input_server/methods/canna/lib/canna.h b/src/add-ons/input_server/methods/canna/lib/canna.h
index 014309d7c7..316779008a 100644
--- a/src/add-ons/input_server/methods/canna/lib/canna.h
+++ b/src/add-ons/input_server/methods/canna/lib/canna.h
@@ -71,7 +71,7 @@
 #define MBstowcs CANNA_mbstowcs
 #define WCstombs CANNA_wcstombs
 
-extern CANNA_wcstombs (char *, WCHAR_T *, int);
+extern int CANNA_wcstombs (char *, WCHAR_T *, int);
 
 #endif
 
@@ -814,7 +814,7 @@ typedef struct _extra_func {
 #define canna_version(majv, minv) ((majv) * 1024 + (minv))
 
 /* ¤è¤¯¥¹¥Ú¥ë¥ß¥¹¤¹¤ë¤Î¤Ç¥³¥ó¥Ñ¥¤¥ë»þ¤Ë¤Ò¤Ã¤«¤«¤ë¤è¤¦¤ËÆþ¤ì¤ë */
-extern RkwGoto (char *, int);
+extern int RkwGoto (char *, int);
 
 /* storing customize configuration to the following structure. */
 struct CannaConfig { /* °Ê²¼¤Î¥³¥á¥ó¥È¤Ï¥À¥¤¥¢¥í¥°¤Ê¤É¤Ëµ­½Ò¤¹¤ë¤È¤­¤Ê¤É¤Ë
diff --git a/src/add-ons/input_server/methods/canna/lib/chikuji.c b/src/add-ons/input_server/methods/canna/lib/chikuji.c
index cf4aab4e7e..986d17a1cd 100644
--- a/src/add-ons/input_server/methods/canna/lib/chikuji.c
+++ b/src/add-ons/input_server/methods/canna/lib/chikuji.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "$Id: chikuji.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "$Id$";
 #endif
 
 #include	"canna.h"
@@ -90,7 +90,7 @@ clearHenkanContext(yomiContext yc)
   return;
 }
 
-extern NothingChanged (uiContext);
+extern int NothingChanged (uiContext);
 
 /*
   restoreChikujiYomi
@@ -306,6 +306,7 @@ chikujiSubstYomi(uiContext d)
   return(ret);
 }
 
+int
 ChikujiSubstYomi(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -754,14 +755,14 @@ generalNaive(uiContext d, int (*fn )(...))
 static int
 ChikujiHenkanNaive(uiContext d)
 {
-  return generalNaive(d, YomiInsert);
+  return generalNaive(d, (int(*)(...))YomiInsert);
 }
 
 
 static int
 ChikujiHenkanOrNothing(uiContext d)
 {
-  return generalNaive(d, NothingChanged);
+  return generalNaive(d, (int(*)(...))NothingChanged);
 }
 
 
diff --git a/src/add-ons/input_server/methods/canna/lib/defaultmap.c b/src/add-ons/input_server/methods/canna/lib/defaultmap.c
index 0e72f62f72..efee900cad 100644
--- a/src/add-ons/input_server/methods/canna/lib/defaultmap.c
+++ b/src/add-ons/input_server/methods/canna/lib/defaultmap.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: defaultmap.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif	/* lint */
 
 #include "canna.h"
@@ -40,13 +40,13 @@ unsigned char f))(...)
 
   for (p = tbl ; p->funcid || p->cfunc ; p++) {
     if (p->funcid == (unsigned char)f) {
-      return p->cfunc;
+      return (int (*)(...))p->cfunc;
     }
   }
-  return (int (*)())0;
+  return (int (*)(...))0;
 }
 
-static
+static int
 simpleUndefBehavior(uiContext d)
 {
   switch (howToBehaveInCaseOfUndefKey)
diff --git a/src/add-ons/input_server/methods/canna/lib/ebind.c b/src/add-ons/input_server/methods/canna/lib/ebind.c
index 3c5ae128ee..c1847ebe8f 100644
--- a/src/add-ons/input_server/methods/canna/lib/ebind.c
+++ b/src/add-ons/input_server/methods/canna/lib/ebind.c
@@ -26,7 +26,7 @@
 /************************************************************************/
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcsid[] = "$Id: ebind.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcsid[] = "$Id$";
 #endif
 
 #include "canna.h"
@@ -37,7 +37,7 @@ static WCHAR_T *inbuf = 0;
 static int inbufsize = 0;
 
 
-static
+static int
 StoreWCtoEUC(WCHAR_T *wbuf, int wbuflen, wcKanjiStatus *wks, char *ebuf, int maxebuf, jrKanjiStatus *ks, int ch, int nbytes)
 {
   int ret, rest, totallen = 0, len;
@@ -175,7 +175,7 @@ StoreWCtoEUC(WCHAR_T *wbuf, int wbuflen, wcKanjiStatus *wks, char *ebuf, int max
   return ret;
 }
 
-inline
+inline int
 XLookupKanji2(
 	unsigned int	dpy, 
 	unsigned int	win, 
diff --git a/src/add-ons/input_server/methods/canna/lib/empty.c b/src/add-ons/input_server/methods/canna/lib/empty.c
index f0ed634e1f..8be759a7f0 100644
--- a/src/add-ons/input_server/methods/canna/lib/empty.c
+++ b/src/add-ons/input_server/methods/canna/lib/empty.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: empty.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -36,23 +36,23 @@ static char rcs_id[] = "@(#) 102.1 $Id: empty.c,v 1.1 2004/12/23 21:23:49 korli
 
 extern struct RkRxDic *romajidic, *englishdic;
 
-static inEmptySelfInsert(uiContext d);
-static EmptySelfInsert(uiContext d);
-static EmptyYomiInsert(uiContext d);
-static EmptyQuotedInsert(uiContext d);
-static AlphaSelfInsert(uiContext d);
-static AlphaNop(uiContext d);
-static EmptyQuit(uiContext d);
-static EmptyKakutei(uiContext d);
-static EmptyDeletePrevious(uiContext d);
-static UserMode(uiContext d, extraFunc *estruct);
-static UserSelect(uiContext d, extraFunc *estruct);
-static UserMenu(uiContext d, extraFunc *estruct);
-static ProcExtraFunc(uiContext d, int fnum);
-static HenkanRegion(uiContext d);
-static PhonoEdit(uiContext d);
-static DicEdit(uiContext d);
-static Configure(uiContext d);
+static int inEmptySelfInsert(uiContext d);
+static int EmptySelfInsert(uiContext d);
+static int EmptyYomiInsert(uiContext d);
+static int EmptyQuotedInsert(uiContext d);
+static int AlphaSelfInsert(uiContext d);
+static int AlphaNop(uiContext d);
+static int EmptyQuit(uiContext d);
+static int EmptyKakutei(uiContext d);
+static int EmptyDeletePrevious(uiContext d);
+static int UserMode(uiContext d, extraFunc *estruct);
+static int UserSelect(uiContext d, extraFunc *estruct);
+static int UserMenu(uiContext d, extraFunc *estruct);
+static int ProcExtraFunc(uiContext d, int fnum);
+static int HenkanRegion(uiContext d);
+static int PhonoEdit(uiContext d);
+static int DicEdit(uiContext d);
+static int Configure(uiContext d);
 static int renbunInit(uiContext d);
 static int showVersion(uiContext d);
 static int showServer(uiContext d);
@@ -67,7 +67,7 @@ extern KanjiModeRec yomi_mode, cy_mode;
  * 
  */
 
-static
+static int
 inEmptySelfInsert(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -83,7 +83,7 @@ inEmptySelfInsert(uiContext d)
 }
 
 
-static
+static int
 EmptySelfInsert(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -110,7 +110,7 @@ EmptySelfInsert(uiContext d)
  */
 
 
-static
+static int
 EmptyYomiInsert(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -131,7 +131,7 @@ EmptyYomiInsert(uiContext d)
   ¤¹¤ë¤Ê¤ó¤Æ¤³¤È¤ÏɬÍפʤ¤¤Î¤Ç¤Ï¤Ê¤¤¤Î¤«¤Ê¤¡¡£
  */
 
-static
+static int
 EmptyQuotedInsert(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -145,7 +145,7 @@ EmptyQuotedInsert(uiContext d)
   AlphaSelfInsert -- ¼«Ê¬¼«¿È¤ò³ÎÄêʸ»úÎó¤È¤·¤ÆÊÖ¤¹´Ø¿ô¡£
  */
 
-static
+static int
 AlphaSelfInsert(uiContext d)
 {
   unsigned kanap = (unsigned)d->ch;
@@ -166,7 +166,7 @@ AlphaSelfInsert(uiContext d)
   }
 }
 
-static
+static int
 AlphaNop(uiContext d)
 {
   /* currentModeInfo ¤Ç¥â¡¼¥É¾ðÊó¤¬É¬¤ºÊÖ¤ë¤è¤¦¤Ë¥À¥ß¡¼¤Î¥â¡¼¥É¤òÆþ¤ì¤Æ¤ª¤¯ */
@@ -175,7 +175,7 @@ AlphaNop(uiContext d)
   return 0;
 }
 
-static
+static int
 EmptyQuit(uiContext d)
 {
   int res;
@@ -189,7 +189,7 @@ EmptyQuit(uiContext d)
   return res;
 }
 
-static
+static int
 EmptyKakutei(uiContext d)
 {
   int res;
@@ -203,7 +203,7 @@ EmptyKakutei(uiContext d)
   return res;
 }
 
-static
+static int
 EmptyDeletePrevious(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -231,7 +231,7 @@ FindExtraFunc(int fnum)
   return (extraFunc *)0;
 }
 
-static
+static int
 UserMode(uiContext d, extraFunc *estruct)
 {
   newmode *nmode = estruct->u.modeptr;
@@ -261,7 +261,7 @@ UserMode(uiContext d, extraFunc *estruct)
 }
 
 #ifndef NO_EXTEND_MENU /* continues to the bottom of this file */
-static
+static int
 UserSelect(uiContext d, extraFunc *estruct)
 {
   int curkigo = 0, *posp = (int *)0;
@@ -302,10 +302,10 @@ UserSelect(uiContext d, extraFunc *estruct)
     return NothingChangedWithBeep(d);
   }
   return uuKigoMake(d, kigop->kigo_data, kigop->kigo_size, 
-                    curkigo, kigop->kigo_mode, uuKigoGeneralExitCatch, posp);
+                    curkigo, kigop->kigo_mode, (int(*)(...))uuKigoGeneralExitCatch, posp);
 }
   
-static
+static int
 UserMenu(uiContext d, extraFunc *estruct)
 {
   return showmenu(d, estruct->u.menuptr);
@@ -314,7 +314,7 @@ UserMenu(uiContext d, extraFunc *estruct)
 
 /* ¥Ç¥Õ¥©¥ë¥È°Ê³°¤Î¥â¡¼¥É»ÈÍÑ»þ¤Ë¸Æ¤Ó½Ð¤¹´Ø¿ô¤òÀÚ¤êʬ¤±¤ë */
 
-static
+static int
 ProcExtraFunc(uiContext d, int fnum)
 {
   extraFunc *extrafunc;
@@ -337,6 +337,7 @@ ProcExtraFunc(uiContext d, int fnum)
   return NothingChangedWithBeep(d);
 }
 
+int
 getBaseMode(yomiContext yc)
 {
   int res;
@@ -382,6 +383,7 @@ EmptyBaseModeInfo(uiContext d, yomiContext yc)
   currentModeInfo(d);
 }
 
+int
 EmptyBaseHira(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -395,6 +397,7 @@ EmptyBaseHira(uiContext d)
   return 0;
 }
 
+int
 EmptyBaseKata(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -411,6 +414,7 @@ EmptyBaseKata(uiContext d)
   return 0;
 }
 
+int
 EmptyBaseEisu(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -425,6 +429,7 @@ EmptyBaseEisu(uiContext d)
   return 0;
 }
 
+int
 EmptyBaseZen(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -445,6 +450,7 @@ EmptyBaseZen(uiContext d)
   return 0;
 }
 
+int
 EmptyBaseHan(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -472,6 +478,7 @@ EmptyBaseHan(uiContext d)
   return 0;
 }
 
+int
 EmptyBaseKana(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -494,6 +501,7 @@ EmptyBaseKana(uiContext d)
   return 0;
 }
 
+int
 EmptyBaseKakutei(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -507,6 +515,7 @@ EmptyBaseKakutei(uiContext d)
   return 0;
 }
 
+int
 EmptyBaseHenkan(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -746,7 +755,7 @@ dicSync(uiContext d)
 {
   int retval = 0;
   char s[512];
-  extern defaultContext;
+  extern int defaultContext;
   yomiContext yc = (yomiContext)d->modec;
 
   if (yc->generalFlags & CANNA_YOMI_CHGMODE_INHIBITTED) {
diff --git a/src/add-ons/input_server/methods/canna/lib/engine.c b/src/add-ons/input_server/methods/canna/lib/engine.c
index 86ac1c6a0c..b212c5cbbb 100644
--- a/src/add-ons/input_server/methods/canna/lib/engine.c
+++ b/src/add-ons/input_server/methods/canna/lib/engine.c
@@ -25,7 +25,7 @@
 /************************************************************************/
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "$Id: engine.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "$Id$";
 #endif
 
 #include "canna.h"
@@ -33,6 +33,7 @@ static char rcs_id[] = "$Id: engine.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
 #define CANNA_SERVER_NAME_LEN 128
 static char iroha_server_name[CANNA_SERVER_NAME_LEN] = {0, 0};
 
+int
 RkSetServerName(char *s)
 {
   if (s)
diff --git a/src/add-ons/input_server/methods/canna/lib/henkan.c b/src/add-ons/input_server/methods/canna/lib/henkan.c
index aaae34da58..11a67c4f75 100644
--- a/src/add-ons/input_server/methods/canna/lib/henkan.c
+++ b/src/add-ons/input_server/methods/canna/lib/henkan.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static	char	rcs_id[] = "@(#) 102.1 $Id: henkan.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static	char	rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include	"canna.h"
@@ -59,7 +59,7 @@ extern int RkwGetServerVersion (int *, int *);
 #define DICERRORMESGLEN 78
 
 
-static doYomiHenkan(uiContext d, int len, WCHAR_T *kanji);
+static int doYomiHenkan(uiContext d, int len, WCHAR_T *kanji);
 
 static char dictmp[DICERRORMESGLEN];
 
@@ -132,14 +132,14 @@ autodicError(void)
  * °ú¤­¿ô	¤Ê¤·
  * Ìá¤êÃÍ	0:¤Þ¤¢Àµ¾ï¡¢ -1:¤È¤³¤È¤óÉÔÎÉ
  */
-KanjiInit()
+int KanjiInit()
 {
 char			*ptr, *getenv(), *kodmesg = ""/* ¼­½ñ¤Î¼ïÊÌËè¤Î¥á¥Ã¥»¡¼¥¸ */;
 int				con;
 static int		mountnottry = 1; /* ¥Þ¥¦¥ó¥È½èÍý¤ò¹Ô¤Ã¤Æ¤¤¤ë¤«¤É¤¦¤« */
 struct			dicname *stp;
 extern struct	dicname *kanjidicnames;
-extern			FirstTime;
+extern			int FirstTime;
 extern			jrUserInfoStruct *uinfo;
 extern char		*RkGetServerHost(void);
 extern char		basepath[];
@@ -396,7 +396,7 @@ char 			dichomedir[256];
  * °ú¤­¿ô	¤Ê¤·
  * Ìá¤êÃÍ	¤Ê¤·
  */
-KanjiFin(void)
+int KanjiFin(void)
 {
   struct dicname *dp, *np;
   int con;
@@ -1149,7 +1149,7 @@ prepareHenkanMode(uiContext d)
   return 1;
 }
 
-doHenkan(uiContext d, int len, WCHAR_T *kanji)
+int doHenkan(uiContext d, int len, WCHAR_T *kanji)
 {
   /* ¤è¤ß¤ò´Á»ú¤ËÊÑ´¹¤¹¤ë */
   if(doYomiHenkan(d, len, kanji) == NG) {
@@ -1173,12 +1173,12 @@ doHenkan(uiContext d, int len, WCHAR_T *kanji)
  *			  ¥«¥ì¥ó¥È¸õÊä¤ò kanji ¤Ç¼¨¤µ¤ì¤¿¸õÊä¤Ë¹ç¤ï¤»¤ë¡£
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-static
+static int
 doYomiHenkan(uiContext d, int len, WCHAR_T *kanji)
 {
   unsigned int mode;
   yomiContext yc = (yomiContext)d->modec;
-  extern defaultContext;
+  extern int defaultContext;
 
 #if defined(DEBUG) && !defined(WIN)
   if (iroha_debug) {
@@ -1383,7 +1383,7 @@ TanBackwardBunsetsu(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
 
-static
+static int
 tanNextKouho(uiContext d, yomiContext yc)
 {
 #ifdef MEASURE_TIME
@@ -1496,7 +1496,7 @@ enterTanHenkanMode(uiContext d, int fnum)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
 
-TanKouhoIchiran(uiContext d)
+int TanKouhoIchiran(uiContext d)
 {
   if (d->modec->id != YOMI_CONTEXT) {
     return enterTanHenkanMode(d, CANNA_FN_KouhoIchiran);
@@ -1504,7 +1504,7 @@ TanKouhoIchiran(uiContext d)
   return tanKouhoIchiran(d, 1);
 }
 
-TanNextKouho(uiContext d)
+int TanNextKouho(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -1521,7 +1521,7 @@ TanNextKouho(uiContext d)
   TanHenkan -- ²ó¿ô¤ò¥Á¥§¥Ã¥¯¤¹¤ë°Ê³°¤Ï TanNextKouho ¤È¤Û¤ÜƱ¤¸
 
  */
-static TanHenkan (uiContext);
+static int TanHenkan (uiContext);
 
 static int
 TanHenkan(uiContext d)
@@ -1547,7 +1547,7 @@ TanHenkan(uiContext d)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-TanPreviousKouho(uiContext d)
+int TanPreviousKouho(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -1588,58 +1588,58 @@ tanJishuHenkan(uiContext d, int fn)
   return d->nbytes;
 }
 
-TanHiragana(uiContext d)
+int TanHiragana(uiContext d)
 {
   return tanJishuHenkan(d, CANNA_FN_Hiragana);
 }
 
-TanKatakana(uiContext d)
+int TanKatakana(uiContext d)
 {
   return tanJishuHenkan(d, CANNA_FN_Katakana);
 }
 
-TanRomaji(uiContext d)
+int TanRomaji(uiContext d)
 {
   return tanJishuHenkan(d, CANNA_FN_Romaji);
 }
 
-TanUpper(uiContext d)
+int TanUpper(uiContext d)
 {
   return tanJishuHenkan(d, CANNA_FN_ToUpper);
 }
 
-TanCapitalize(uiContext d)
+int TanCapitalize(uiContext d)
 {
   return tanJishuHenkan(d, CANNA_FN_Capitalize);
 }
 
-TanZenkaku(uiContext d)
+int TanZenkaku(uiContext d)
 {
   return tanJishuHenkan(d, CANNA_FN_Zenkaku);
 }
 
-TanHankaku(uiContext d)
+int TanHankaku(uiContext d)
 {
   return tanJishuHenkan(d, CANNA_FN_Hankaku);
 }
 
 int TanKanaRotate (uiContext);
 
-TanKanaRotate(uiContext d)
+int TanKanaRotate(uiContext d)
 {
   return tanJishuHenkan(d, CANNA_FN_KanaRotate);
 }
 
 int TanRomajiRotate (uiContext);
 
-TanRomajiRotate(uiContext d)
+int TanRomajiRotate(uiContext d)
 {
   return tanJishuHenkan(d, CANNA_FN_RomajiRotate);
 }
 
 int TanCaseRotateForward (uiContext);
 
-TanCaseRotateForward(uiContext d)
+int TanCaseRotateForward(uiContext d)
 {
   return tanJishuHenkan(d, CANNA_FN_CaseRotate);
 }
@@ -1764,7 +1764,7 @@ tanMuhenkan(uiContext d, int kCurs)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
 
-TanMuhenkan(uiContext d)
+int TanMuhenkan(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec, newyc;
   tanContext tan;
@@ -2027,7 +2027,7 @@ finishTanKakutei(uiContext d)
   }
 }
 
-TanKakutei(uiContext d)
+int TanKakutei(uiContext d)
 {
   return YomiKakutei(d);
 }
@@ -2042,7 +2042,7 @@ TanKakutei(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
 
-static TanKakuteiYomiInsert (uiContext);
+static int TanKakuteiYomiInsert (uiContext);
 
 static int
 TanKakuteiYomiInsert(uiContext d)
@@ -2074,7 +2074,7 @@ TanKakuteiYomiInsert(uiContext d)
 	yc->ys = yc->ye = yc->cStartp;
 	return YomiInsert(d);
       }else{ /* Ã༡¤¸¤ã¤Ê¤¤¾ì¹ç */
-	extern nKouhoBunsetsu;
+	extern int nKouhoBunsetsu;
     
 	yc->curbun = yc->nbunsetsu;
 	if (doTanBubunMuhenkan(d, yc) < 0) {
@@ -2155,7 +2155,7 @@ doTbResize(uiContext d, yomiContext yc, int n)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-static TanExtendBunsetsu (uiContext);
+static int TanExtendBunsetsu (uiContext);
 
 static int
 TanExtendBunsetsu(uiContext d)
@@ -2187,7 +2187,7 @@ TanExtendBunsetsu(uiContext d)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-static TanShrinkBunsetsu (uiContext);
+static int TanShrinkBunsetsu (uiContext);
 
 static int
 TanShrinkBunsetsu(uiContext d)
@@ -2226,7 +2226,7 @@ TanShrinkBunsetsu(uiContext d)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-TanPrintBunpou(uiContext d)
+int TanPrintBunpou(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
   static WCHAR_T mesg[512]; /* static! */
@@ -2310,7 +2310,7 @@ TanPrintTime(uiContext d)
 void
 jrKanjiPipeError(void)
 {
-  extern defaultContext, defaultBushuContext;
+  extern int defaultContext, defaultBushuContext;
 
   defaultContext = -1;
   defaultBushuContext = -1;
@@ -2332,9 +2332,9 @@ jrKanjiPipeError(void)
 
  */
 
-static TanBunsetsuMode (uiContext);
+static int TanBunsetsuMode (uiContext);
 
-static
+static int
 TanBunsetsuMode(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
@@ -2560,16 +2560,16 @@ TanChooseChar(uiContext d, int head)
   return retval;
 }
 
-static TanChooseHeadChar (uiContext);
-static TanChooseTailChar (uiContext);
+static int TanChooseHeadChar (uiContext);
+static int TanChooseTailChar (uiContext);
 
-static
+static int
 TanChooseHeadChar(uiContext d)
 {
   return TanChooseChar(d, 1);
 }
 
-static
+static int
 TanChooseTailChar(uiContext d)
 {
   return TanChooseChar(d, 0);
diff --git a/src/add-ons/input_server/methods/canna/lib/hex.c b/src/add-ons/input_server/methods/canna/lib/hex.c
index 261d590ec3..1c971daf3a 100644
--- a/src/add-ons/input_server/methods/canna/lib/hex.c
+++ b/src/add-ons/input_server/methods/canna/lib/hex.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: hex.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #ifndef NO_EXTEND_MENU
@@ -30,10 +30,10 @@ static char rcs_id[] = "@(#) 102.1 $Id: hex.c,v 1.1 2004/12/23 21:23:49 korli Ex
 #define HEXPROMPT "\245\263\241\274\245\311: "
 #define HEXPROMPTLEN  5 /* "¥³¡¼¥É: " ¤ÎŤµ¤Ï5¥Ð¥¤¥È */
 
-static hexEveryTimeCatch(uiContext d, int retval, mode_context env);
-static exitHex(uiContext d, int retval, mode_context env);
-static quitHex(uiContext d, int retval, mode_context env);
-static hexMode(uiContext d, int major_mode);
+static int hexEveryTimeCatch(uiContext d, int retval, mode_context env);
+static int exitHex(uiContext d, int retval, mode_context env);
+static int quitHex(uiContext d, int retval, mode_context env);
+static int hexMode(uiContext d, int major_mode);
 
 static int quitHex();
 
@@ -43,7 +43,7 @@ static int quitHex();
 
  */
 
-static
+static int
 hexEveryTimeCatch(uiContext d, int retval, mode_context env)
      /* ARGSUSED */
 {
@@ -93,7 +93,7 @@ hexEveryTimeCatch(uiContext d, int retval, mode_context env)
   return retval;
 }
 
-static
+static int
 exitHex(uiContext d, int retval, mode_context env)
 {
   killmenu(d);
@@ -121,7 +121,7 @@ quitHex(uiContext d, int retval, mode_context env)
 
 yomiContext GetKanjiString();
 
-static
+static int
 hexMode(uiContext d, int major_mode)
 {
   yomiContext yc;
@@ -147,7 +147,7 @@ hexMode(uiContext d, int major_mode)
 
  */
 
-HexMode(uiContext d)
+int HexMode(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
diff --git a/src/add-ons/input_server/methods/canna/lib/ichiran.c b/src/add-ons/input_server/methods/canna/lib/ichiran.c
index f040122e79..15574bbdcc 100644
--- a/src/add-ons/input_server/methods/canna/lib/ichiran.c
+++ b/src/add-ons/input_server/methods/canna/lib/ichiran.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static	char	rcs_id[] = "@(#) 102.1 $Id: ichiran.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static	char	rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include	<errno.h>
@@ -46,39 +46,39 @@ static void getIchiranNextKouhoretsu();
 
 static void makeIchiranEchoStrCurChange(yomiContext yc);
 static void makeIchiranKanjiStatusReturn(uiContext d, mode_context env, yomiContext yc);
-static ichiranEveryTimeCatch(uiContext d, int retval, mode_context env);
-static ichiranExitCatch(uiContext d, int retval, mode_context env);
-static ichiranQuitCatch(uiContext d, int retval, mode_context env);
+static int ichiranEveryTimeCatch(uiContext d, int retval, mode_context env);
+static int ichiranExitCatch(uiContext d, int retval, mode_context env);
+static int ichiranQuitCatch(uiContext d, int retval, mode_context env);
 static void popIchiranMode(uiContext d);
 static void clearIchiranContext(ichiranContext p);
 static int makeKouhoIchiran(uiContext d, int nelem, int bangomax, unsigned char inhibit, int currentkouho);
-static IchiranKakuteiThenDo(uiContext d, int func);
-static IchiranQuitThenDo(uiContext d, int func);
-static IchiranConvert(uiContext d);
+static int IchiranKakuteiThenDo(uiContext d, int func);
+static int IchiranQuitThenDo(uiContext d, int func);
+static int IchiranConvert(uiContext d);
 static void getIchiranPreviousKouhoretsu(uiContext d);
-static IchiranNextPage(uiContext d);
-static IchiranPreviousPage(uiContext d);
+static int IchiranNextPage(uiContext d);
+static int IchiranPreviousPage(uiContext d);
 static void getIchiranNextKouhoretsu(uiContext d);
-static IchiranBangoKouho(uiContext d);
+static int IchiranBangoKouho(uiContext d);
 static int getIchiranBangoKouho(uiContext d);
-static IchiranKakutei(uiContext d);
-static IchiranExtendBunsetsu(uiContext d);
-static IchiranShrinkBunsetsu(uiContext d);
-static IchiranAdjustBunsetsu(uiContext d);
-static IchiranKillToEndOfLine(uiContext d);
-static IchiranDeleteNext(uiContext d);
-static IchiranBubunMuhenkan(uiContext d);
-static IchiranHiragana(uiContext d);
-static IchiranKatakana(uiContext d);
-static IchiranZenkaku(uiContext d);
-static IchiranHankaku(uiContext d);
-static IchiranRomaji(uiContext d);
-static IchiranToUpper(uiContext d);
-static IchiranToLower(uiContext d);
-static IchiranCapitalize(uiContext d);
-static IchiranKanaRotate(uiContext d);
-static IchiranRomajiRotate(uiContext d);
-static IchiranCaseRotateForward(uiContext d);
+static int IchiranKakutei(uiContext d);
+static int IchiranExtendBunsetsu(uiContext d);
+static int IchiranShrinkBunsetsu(uiContext d);
+static int IchiranAdjustBunsetsu(uiContext d);
+static int IchiranKillToEndOfLine(uiContext d);
+static int IchiranDeleteNext(uiContext d);
+static int IchiranBubunMuhenkan(uiContext d);
+static int IchiranHiragana(uiContext d);
+static int IchiranKatakana(uiContext d);
+static int IchiranZenkaku(uiContext d);
+static int IchiranHankaku(uiContext d);
+static int IchiranRomaji(uiContext d);
+static int IchiranToUpper(uiContext d);
+static int IchiranToLower(uiContext d);
+static int IchiranCapitalize(uiContext d);
+static int IchiranKanaRotate(uiContext d);
+static int IchiranRomajiRotate(uiContext d);
+static int IchiranCaseRotateForward(uiContext d);
 static char *sbango = 
   "\243\261\241\241\243\262\241\241\243\263\241\241\243\264\241\241\243\265"
   "\241\241\243\266\241\241\243\267\241\241\243\270\241\241\243\271\241\241"
@@ -100,7 +100,7 @@ static char *skuuhaku = "\241\241";
 			/* ¡¡ */
 static WCHAR_T *kuuhaku;
 
-initIchiran(void)
+int initIchiran(void)
 {
   int i, retval = 0;
   char buf[16];
@@ -213,9 +213,9 @@ makeGlineStatus(uiContext d)
   }
 }
 
-static ichiranEveryTimeCatch (uiContext, int, mode_context);
+static int ichiranEveryTimeCatch (uiContext, int, mode_context);
 
-static
+static int
 ichiranEveryTimeCatch(uiContext d, int retval, mode_context env)
 {
   yomiContext yc;
@@ -228,9 +228,9 @@ ichiranEveryTimeCatch(uiContext d, int retval, mode_context env)
   return(retval);
 }
 
-static ichiranExitCatch (uiContext, int, mode_context);
+static int ichiranExitCatch (uiContext, int, mode_context);
 
-static
+static int
 ichiranExitCatch(uiContext d, int retval, mode_context env)
 {
   yomiContext yc;
@@ -269,9 +269,9 @@ ichiranExitCatch(uiContext d, int retval, mode_context env)
   return(retval);
 }
 
-static ichiranQuitCatch (uiContext, int, mode_context);
+static int ichiranQuitCatch (uiContext, int, mode_context);
 
-static
+static int
 ichiranQuitCatch(uiContext d, int retval, mode_context env)
 {
   yomiContext yc;
@@ -531,7 +531,7 @@ clearIchiranContext(ichiranContext p)
 /*
  * ¸õÊä°ìÍ÷¤Î¥Ç¡¼¥¿¹½Â¤ÂΤòºî¤ë¤¿¤á¤ÎÎΰè¤ò³ÎÊݤ¹¤ë
  */
-allocIchiranBuf(uiContext d)
+int allocIchiranBuf(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
   int size;
@@ -735,7 +735,7 @@ makeKouhoIchiran(uiContext d, int nelem, int bangomax, unsigned char inhibit, in
   return(0);
 }
 
-tanKouhoIchiran(uiContext d, int step)
+int tanKouhoIchiran(uiContext d, int step)
 {
   yomiContext yc = (yomiContext)d->modec;
   ichiranContext ic;
@@ -805,7 +805,7 @@ tanKouhoIchiran(uiContext d, int step)
 /*
  * ¸õÊä°ìÍ÷¹Ô¤Îɽ¼¨¤ò¶¯À©½ªÎ»¤¹¤ë
  */
-IchiranQuit(uiContext d)
+int IchiranQuit(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
   int retval = 0;
@@ -860,7 +860,7 @@ IchiranNop(uiContext d)
      -- Do determine from the candidate list, then do one more function.
  */
 
-static
+static int
 IchiranKakuteiThenDo(uiContext d, int func)
 {
   ichiranContext ic = (ichiranContext)d->modec;
@@ -883,7 +883,7 @@ IchiranKakuteiThenDo(uiContext d, int func)
 }
 
 static
-IchiranQuitThenDo(uiContext d, int func)
+int IchiranQuitThenDo(uiContext d, int func)
 {
   ichiranContext ic = (ichiranContext)d->modec;
   int retval;
@@ -908,7 +908,7 @@ IchiranQuitThenDo(uiContext d, int func)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-IchiranForwardKouho(uiContext d)
+int IchiranForwardKouho(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
 
@@ -960,7 +960,7 @@ IchiranForwardKouho(uiContext d)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-IchiranBackwardKouho(uiContext d)
+int IchiranBackwardKouho(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
   BYTE mode;
@@ -1012,10 +1012,10 @@ IchiranBackwardKouho(uiContext d)
    IchiranConvert() will be called when `convert' key is pressed
  */
 
-static IchiranConvert (uiContext);
+static int IchiranConvert (uiContext);
 
 static
-IchiranConvert(uiContext d)
+int IchiranConvert(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
 
@@ -1037,7 +1037,7 @@ IchiranConvert(uiContext d)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-IchiranPreviousKouhoretsu(uiContext d)
+int IchiranPreviousKouhoretsu(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
 
@@ -1113,7 +1113,7 @@ getIchiranPreviousKouhoretsu(uiContext d)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-IchiranNextKouhoretsu(uiContext d)
+int IchiranNextKouhoretsu(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
 
@@ -1150,10 +1150,10 @@ IchiranNextKouhoretsu(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
 
-static IchiranNextPage (uiContext);
+static int IchiranNextPage (uiContext);
 
 static
-IchiranNextPage(uiContext d)
+int IchiranNextPage(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
 
@@ -1180,10 +1180,10 @@ IchiranNextPage(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
 
-static IchiranPreviousPage (uiContext);
+static int IchiranPreviousPage (uiContext);
 
 static
-IchiranPreviousPage(uiContext d)
+int IchiranPreviousPage(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
 
@@ -1249,7 +1249,7 @@ getIchiranNextKouhoretsu(uiContext d)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-IchiranBeginningOfKouho(uiContext d)
+int IchiranBeginningOfKouho(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
 
@@ -1287,7 +1287,7 @@ IchiranBeginningOfKouho(uiContext d)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-IchiranEndOfKouho(uiContext d)
+int IchiranEndOfKouho(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
 
@@ -1328,10 +1328,10 @@ IchiranEndOfKouho(uiContext d)
  */
 
 static int getIchiranBangoKouho (uiContext);
-static IchiranBangoKouho (uiContext);
+static int IchiranBangoKouho (uiContext);
 
 static
-IchiranBangoKouho(uiContext d)
+int IchiranBangoKouho(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
   int zflag, retval = 0;
@@ -1515,138 +1515,138 @@ ichiranFin(uiContext d)
   GlineClear(d);
 }
 
-static IchiranExtendBunsetsu (uiContext);
+static int IchiranExtendBunsetsu (uiContext);
 
 static
-IchiranExtendBunsetsu(uiContext d)
+int IchiranExtendBunsetsu(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_Extend);
 }
 
-static IchiranShrinkBunsetsu (uiContext);
+static int IchiranShrinkBunsetsu (uiContext);
 
 static
-IchiranShrinkBunsetsu(uiContext d)
+int IchiranShrinkBunsetsu(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_Shrink);
 }
 
-static IchiranAdjustBunsetsu (uiContext);
+static int IchiranAdjustBunsetsu (uiContext);
 
 static
-IchiranAdjustBunsetsu(uiContext d)
+int IchiranAdjustBunsetsu(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_AdjustBunsetsu);
 }
 
-static IchiranKillToEndOfLine (uiContext);
+static int IchiranKillToEndOfLine (uiContext);
 
 static
-IchiranKillToEndOfLine(uiContext d)
+int IchiranKillToEndOfLine(uiContext d)
 {
   return IchiranKakuteiThenDo(d, CANNA_FN_KillToEndOfLine);
 }
 
-static IchiranDeleteNext (uiContext);
+static int IchiranDeleteNext (uiContext);
 
 static
-IchiranDeleteNext(uiContext d)
+int IchiranDeleteNext(uiContext d)
 {
   return IchiranKakuteiThenDo(d, CANNA_FN_DeleteNext);
 }
 
-static IchiranBubunMuhenkan (uiContext);
+static int IchiranBubunMuhenkan (uiContext);
 
 static
-IchiranBubunMuhenkan(uiContext d)
+int IchiranBubunMuhenkan(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_BubunMuhenkan);
 }
 
-static IchiranHiragana (uiContext);
+static int IchiranHiragana (uiContext);
 
 static
-IchiranHiragana(uiContext d)
+int IchiranHiragana(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_Hiragana);
 }
 
-static IchiranKatakana (uiContext);
+static int IchiranKatakana (uiContext);
 
 static
-IchiranKatakana(uiContext d)
+int IchiranKatakana(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_Katakana);
 }
 
-static IchiranZenkaku (uiContext);
+static int IchiranZenkaku (uiContext);
 
 static
-IchiranZenkaku(uiContext d)
+int IchiranZenkaku(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_Zenkaku);
 }
 
-static IchiranHankaku (uiContext);
+static int IchiranHankaku (uiContext);
 
 static
-IchiranHankaku(uiContext d)
+int IchiranHankaku(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_Hankaku);
 }
 
-static IchiranRomaji (uiContext);
+static int IchiranRomaji (uiContext);
 
 static
-IchiranRomaji(uiContext d)
+int IchiranRomaji(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_Romaji);
 }
 
-static IchiranToUpper (uiContext);
+static int IchiranToUpper (uiContext);
 
 static
-IchiranToUpper(uiContext d)
+int IchiranToUpper(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_ToUpper);
 }
 
-static IchiranToLower (uiContext);
+static int IchiranToLower (uiContext);
 
 static
-IchiranToLower(uiContext d)
+int IchiranToLower(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_ToLower);
 }
 
-static IchiranCapitalize (uiContext);
+static int IchiranCapitalize (uiContext);
 
 static
-IchiranCapitalize(uiContext d)
+int IchiranCapitalize(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_Capitalize);
 }
 
-static IchiranKanaRotate (uiContext);
+static int IchiranKanaRotate (uiContext);
 
 static
-IchiranKanaRotate(uiContext d)
+int IchiranKanaRotate(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_KanaRotate);
 }
 
-static IchiranRomajiRotate (uiContext);
+static int IchiranRomajiRotate (uiContext);
 
 static
-IchiranRomajiRotate(uiContext d)
+int IchiranRomajiRotate(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_RomajiRotate);
 }
 
-static IchiranCaseRotateForward (uiContext);
+static int IchiranCaseRotateForward (uiContext);
 
 static
-IchiranCaseRotateForward(uiContext d)
+int IchiranCaseRotateForward(uiContext d)
 {
   return IchiranQuitThenDo(d, CANNA_FN_CaseRotate);
 }
diff --git a/src/add-ons/input_server/methods/canna/lib/ichiranmap.h b/src/add-ons/input_server/methods/canna/lib/ichiranmap.h
index e297fba6d2..e21dfa456c 100644
--- a/src/add-ons/input_server/methods/canna/lib/ichiranmap.h
+++ b/src/add-ons/input_server/methods/canna/lib/ichiranmap.h
@@ -22,7 +22,7 @@
 // Modified by T.Murai
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char ichiranmap_id[] = "@(#) 102.1 $Id: ichiranmap.h,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char ichiranmap_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -70,7 +70,7 @@ static struct funccfunc ichiran_funcs[] = {
   {0				,0				},
 };
 
-extern searchfunc(...);
+extern int searchfunc(...);
 KanjiModeRec ichiran_mode = {
   searchfunc,
   default_kmap,
diff --git a/src/add-ons/input_server/methods/canna/lib/jishu.c b/src/add-ons/input_server/methods/canna/lib/jishu.c
index bd1a4546d8..46dbae2809 100644
--- a/src/add-ons/input_server/methods/canna/lib/jishu.c
+++ b/src/add-ons/input_server/methods/canna/lib/jishu.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: jishu.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -66,35 +66,35 @@ static int JishuHankaku();
 #define INHIBIT_HIRA	0x08
 
 static void setInhibitInformation(yomiContext yc);
-static inhibittedJishu(uiContext d);
-static nextJishu(uiContext d);
-static previousJishu(uiContext d);
-static JishuNextJishu(uiContext d);
-static JishuPreviousJishu(uiContext d);
-static JishuRotateWithInhibition(uiContext d, unsigned inhibit);
-static JishuKanaRotate(uiContext d);
-static JishuRomajiRotate(uiContext d);
-static JishuShrink(uiContext d);
-static JishuNop(uiContext d);
-static JishuExtend(uiContext d);
+static int inhibittedJishu(uiContext d);
+static int nextJishu(uiContext d);
+static int previousJishu(uiContext d);
+static int JishuNextJishu(uiContext d);
+static int JishuPreviousJishu(uiContext d);
+static int JishuRotateWithInhibition(uiContext d, unsigned inhibit);
+static int JishuKanaRotate(uiContext d);
+static int JishuRomajiRotate(uiContext d);
+static int JishuShrink(uiContext d);
+static int JishuNop(uiContext d);
+static int JishuExtend(uiContext d);
 static void jishuAdjustRome(uiContext d);
 static void myjishuAdjustRome(uiContext d);
-static JishuZenkaku(uiContext d);
-static JishuHankaku(uiContext d);
-static exitJishuAndDoSomething(uiContext d, int fnum);
-static JishuYomiInsert(uiContext d);
-static JishuQuit(uiContext d);
-static JishuToUpper(uiContext d);
-static JishuCapitalize(uiContext d);
-static JishuToLower(uiContext d);
-static JishuHiragana(uiContext d);
-static JishuKatakana(uiContext d);
-static JishuRomaji(uiContext d);
+static int JishuZenkaku(uiContext d);
+static int JishuHankaku(uiContext d);
+static int exitJishuAndDoSomething(uiContext d, int fnum);
+static int JishuYomiInsert(uiContext d);
+static int JishuQuit(uiContext d);
+static int JishuToUpper(uiContext d);
+static int JishuCapitalize(uiContext d);
+static int JishuToLower(uiContext d);
+static int JishuHiragana(uiContext d);
+static int JishuKatakana(uiContext d);
+static int JishuRomaji(uiContext d);
 static void nextCase(yomiContext yc);
-static JishuCaseRotateForward(uiContext d);
-static JishuKanjiHenkan(uiContext d);
-static JishuKanjiHenkanOInsert(uiContext d);
-static JishuKanjiHenkanONothing(uiContext d);
+static int JishuCaseRotateForward(uiContext d);
+static int JishuKanjiHenkan(uiContext d);
+static int JishuKanjiHenkanOInsert(uiContext d);
+static int JishuKanjiHenkanONothing(uiContext d);
 
 void
 enterJishuMode(uiContext d, yomiContext yc)
@@ -166,7 +166,7 @@ setInhibitInformation(yomiContext yc)
   }
 }
 
-extractJishuString(yomiContext yc, WCHAR_T *s, WCHAR_T *e, WCHAR_T **sr, WCHAR_T **er)
+int extractJishuString(yomiContext yc, WCHAR_T *s, WCHAR_T *e, WCHAR_T **sr, WCHAR_T **er)
 {
   WCHAR_T *ss = s;
   int jishulen, len, revlen;
@@ -373,7 +373,7 @@ extractJishuString(yomiContext yc, WCHAR_T *s, WCHAR_T *e, WCHAR_T **sr, WCHAR_T
 }
 
 static
-inhibittedJishu(uiContext d)
+int inhibittedJishu(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -389,7 +389,7 @@ inhibittedJishu(uiContext d)
 }
 
 static
-nextJishu(uiContext d)
+int nextJishu(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
   BYTE startkc = yc->jishu_kc;
@@ -401,7 +401,7 @@ nextJishu(uiContext d)
 }
 
 static
-previousJishu(uiContext d)
+int previousJishu(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
   BYTE startkc = yc->jishu_kc;
@@ -413,10 +413,10 @@ previousJishu(uiContext d)
   return yc->jishu_kc != startkc;
 }
 
-static JishuNextJishu (uiContext);	    
+static int JishuNextJishu (uiContext);	    
 
 static
-JishuNextJishu(uiContext d)
+int JishuNextJishu(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -433,10 +433,10 @@ JishuNextJishu(uiContext d)
   return 0;
 }
 
-static JishuPreviousJishu (uiContext);
+static int JishuPreviousJishu (uiContext);
 
 static
-JishuPreviousJishu(uiContext d)
+int JishuPreviousJishu(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -453,10 +453,10 @@ JishuPreviousJishu(uiContext d)
   return 0;
 }
 
-static JishuRotateWithInhibition (uiContext, unsigned);
+static int JishuRotateWithInhibition (uiContext, unsigned);
 
 static
-JishuRotateWithInhibition(uiContext d, unsigned inhibit)
+int JishuRotateWithInhibition(uiContext d, unsigned inhibit)
 {
   yomiContext yc = (yomiContext)d->modec;
   BYTE savedInhibition = yc->inhibition;
@@ -469,27 +469,27 @@ JishuRotateWithInhibition(uiContext d, unsigned inhibit)
   return res;
 }
 
-static JishuKanaRotate (uiContext);
+static int JishuKanaRotate (uiContext);
 
 static
-JishuKanaRotate(uiContext d)
+int JishuKanaRotate(uiContext d)
 {
   return JishuRotateWithInhibition(d, INHIBIT_ALPHA);
 }
 
-static JishuRomajiRotate (uiContext);
+static int JishuRomajiRotate (uiContext);
 
 static
-JishuRomajiRotate(uiContext d)
+int JishuRomajiRotate(uiContext d)
 {
   return JishuRotateWithInhibition(d, INHIBIT_KANA | INHIBIT_HIRA);
 }
 
 static void myjishuAdjustRome (uiContext);
-static JishuShrink (uiContext);
+static int JishuShrink (uiContext);
 
 static
-JishuShrink(uiContext d)
+int JishuShrink(uiContext d)
 {  
   yomiContext yc = (yomiContext)d->modec;
 
@@ -547,10 +547,10 @@ JishuShrink(uiContext d)
   return 0;
 }
 
-static JishuNop (uiContext);
+static int JishuNop (uiContext);
 
 static
-JishuNop(uiContext d)
+int JishuNop(uiContext d)
 {
   /* currentModeInfo ¤Ç¥â¡¼¥É¾ðÊó¤¬É¬¤ºÊÖ¤ë¤è¤¦¤Ë¥À¥ß¡¼¤Î¥â¡¼¥É¤òÆþ¤ì¤Æ¤ª¤¯ */
   d->majorMode = d->minorMode = CANNA_MODE_AlphaMode;
@@ -560,10 +560,10 @@ JishuNop(uiContext d)
   return 0;
 }
 
-static JishuExtend (uiContext);
+static int JishuExtend (uiContext);
 
 static
-JishuExtend(uiContext d)
+int JishuExtend(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -725,7 +725,7 @@ JishuHankaku(uiContext d)
 }
 
 static
-exitJishuAndDoSomething(uiContext d, int fnum)
+int exitJishuAndDoSomething(uiContext d, int fnum)
 {
   exitJishu(d);
   d->more.todo = 1;
@@ -736,10 +736,10 @@ exitJishuAndDoSomething(uiContext d, int fnum)
   return d->nbytes = 0;
 }
 
-static JishuYomiInsert (uiContext);
+static int JishuYomiInsert (uiContext);
 
 static
-JishuYomiInsert(uiContext d)
+int JishuYomiInsert(uiContext d)
 {
   if (cannaconf.MojishuContinue) {
     return exitJishuAndDoSomething(d, 0);
@@ -759,10 +759,10 @@ JishuYomiInsert(uiContext d)
   }
 }
 
-static JishuQuit (uiContext);
+static int JishuQuit (uiContext);
 
 static
-JishuQuit(uiContext d)
+int JishuQuit(uiContext d)
 {
   leaveJishuMode(d, (yomiContext)d->modec);
   makeKanjiStatusReturn(d, (yomiContext)d->modec);
@@ -771,10 +771,10 @@ JishuQuit(uiContext d)
 
 /* Âçʸ»ú¤Ë¤¹¤ë´Ø¿ô */
 
-static JishuToUpper (uiContext);
+static int JishuToUpper (uiContext);
 
 static
-JishuToUpper(uiContext d)
+int JishuToUpper(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -799,10 +799,10 @@ JishuToUpper(uiContext d)
   }
 }
 
-static JishuCapitalize (uiContext);
+static int JishuCapitalize (uiContext);
 
 static
-JishuCapitalize(uiContext d)
+int JishuCapitalize(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -827,10 +827,10 @@ JishuCapitalize(uiContext d)
   }
 }
 
-static JishuToLower (uiContext);
+static int JishuToLower (uiContext);
 
 static
-JishuToLower(uiContext d)
+int JishuToLower(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -855,10 +855,10 @@ JishuToLower(uiContext d)
   }
 }
 
-static JishuHiragana (uiContext);
+static int JishuHiragana (uiContext);
 
 static
-JishuHiragana(uiContext d)
+int JishuHiragana(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -867,10 +867,10 @@ JishuHiragana(uiContext d)
   return 0;
 }
 
-static JishuKatakana (uiContext);
+static int JishuKatakana (uiContext);
 
 static
-JishuKatakana(uiContext d)
+int JishuKatakana(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -879,10 +879,10 @@ JishuKatakana(uiContext d)
   return 0;
 }
 
-static JishuRomaji (uiContext);
+static int JishuRomaji (uiContext);
 
 static
-JishuRomaji(uiContext d)
+int JishuRomaji(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -900,10 +900,10 @@ nextCase(yomiContext yc)
   yc->jishu_case = (BYTE)(((int)yc->jishu_case + 1) % CANNA_JISHU_MAX_CASE);
 }
 
-static JishuCaseRotateForward (uiContext);
+static int JishuCaseRotateForward (uiContext);
 
 static
-JishuCaseRotateForward(uiContext d)
+int JishuCaseRotateForward(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -931,26 +931,26 @@ JishuCaseRotateForward(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
 
-static JishuKanjiHenkan (uiContext);
+static int JishuKanjiHenkan (uiContext);
 
 static
-JishuKanjiHenkan(uiContext d)
+int JishuKanjiHenkan(uiContext d)
 {
   return exitJishuAndDoSomething(d, CANNA_FN_Henkan);
 }
 
-static JishuKanjiHenkanOInsert (uiContext);
+static int JishuKanjiHenkanOInsert (uiContext);
 
 static
-JishuKanjiHenkanOInsert(uiContext d)
+int JishuKanjiHenkanOInsert(uiContext d)
 {
   return exitJishuAndDoSomething(d, CANNA_FN_HenkanOrInsert);
 }
 
-static JishuKanjiHenkanONothing (uiContext);
+static int JishuKanjiHenkanONothing (uiContext);
 
 static
-JishuKanjiHenkanONothing(uiContext d)
+int JishuKanjiHenkanONothing(uiContext d)
 {
   return exitJishuAndDoSomething(d, CANNA_FN_HenkanOrNothing);
 }
diff --git a/src/add-ons/input_server/methods/canna/lib/jishumap.h b/src/add-ons/input_server/methods/canna/lib/jishumap.h
index df0d649c15..ca741d8f67 100644
--- a/src/add-ons/input_server/methods/canna/lib/jishumap.h
+++ b/src/add-ons/input_server/methods/canna/lib/jishumap.h
@@ -22,7 +22,7 @@
 // Modified by T.Murai
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char jishumap_id[] = "@(#) 102.1 $Id: jishumap.h,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char jishumap_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -60,7 +60,7 @@ static struct funccfunc jishu_funcs[] = {
   {CANNA_FN_UseOtherKeymap	,UseOtherKeymap		},
   {0				,0			},
 };
-extern searchfunc(...);
+extern int searchfunc(...);
 
 KanjiModeRec jishu_mode = {
   searchfunc,
diff --git a/src/add-ons/input_server/methods/canna/lib/jrbind.c b/src/add-ons/input_server/methods/canna/lib/jrbind.c
index 48ca34c292..647265d780 100644
--- a/src/add-ons/input_server/methods/canna/lib/jrbind.c
+++ b/src/add-ons/input_server/methods/canna/lib/jrbind.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: jrbind.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -116,7 +116,7 @@ newUiContext(unsigned int dpy, unsigned int win)
 
 extern int kanjiControl (int, uiContext, caddr_t);
 
-XwcLookupKanji2(unsigned int dpy, unsigned int win, WCHAR_T *buffer_return, int nbuffer, int nbytes, int functionalChar, wcKanjiStatus *kanji_status_return)
+int XwcLookupKanji2(unsigned int dpy, unsigned int win, WCHAR_T *buffer_return, int nbuffer, int nbytes, int functionalChar, wcKanjiStatus *kanji_status_return)
 {
   uiContext d;
   int retval;
@@ -237,7 +237,9 @@ struct map {
   BYTE key;
   KanjiMode mode;
   struct map *next;
-} *mapFromHash();
+};
+ 
+struct map *mapFromHash();
 
 /* cfuncdef
 
diff --git a/src/add-ons/input_server/methods/canna/lib/kctrl.c b/src/add-ons/input_server/methods/canna/lib/kctrl.c
index ac5730f28c..03e17a0c54 100644
--- a/src/add-ons/input_server/methods/canna/lib/kctrl.c
+++ b/src/add-ons/input_server/methods/canna/lib/kctrl.c
@@ -25,7 +25,7 @@
 /************************************************************************/
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: kctrl.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -51,7 +51,7 @@ static void freeBuffer (void);
 static void freeExtra (void);
 
 static
-doInitializeFunctions(uiContext d)
+int doInitializeFunctions(uiContext d)
 {
   BYTE *p;
   int res = 0;
@@ -78,13 +78,13 @@ doInitializeFunctions(uiContext d)
 
 /* uiContext ¤Î½é´ü²½ */
 
-initRomeStruct(uiContext d, int flg)
+int initRomeStruct(uiContext d, int flg)
 {
   extern KanjiModeRec alpha_mode, empty_mode;
   extern KanjiModeRec kzhr_mode, kzkt_mode, kzal_mode;
   extern KanjiModeRec khkt_mode, khal_mode;
   yomiContext yc;
-  extern defaultContext, defaultBushuContext;
+  extern int defaultContext, defaultBushuContext;
 
   bzero(d, sizeof(uiContextRec));
 
@@ -209,7 +209,7 @@ freeRomeStruct(uiContext d)
 }
 
 static
-insertEmptySlots(uiContext d)
+int insertEmptySlots(uiContext d)
 {
   extern KanjiModeRec	empty_mode;
   yomiContext		yc;
@@ -262,7 +262,7 @@ static struct bukRec {
 /* ¥Ï¥Ã¥·¥å¥Æ¡¼¥Ö¥ë¤òÄ´¤Ù¤Æ¥³¥ó¥Æ¥¯¥¹¥È¤¬¤¢¤ë¤«¤É¤¦¤«Ä´¤Ù¤ë´Ø¿ô */
 
 static
-countContext(void)
+int countContext(void)
 {
   struct bukRec *hash;
 
@@ -475,7 +475,7 @@ extern void (*keyconvCallback)(...);
 extern void restoreBindings();
 
 static
-KC_initialize(uiContext d, char *arg)
+int KC_initialize(uiContext d, char *arg)
      /* ARGSUSED */
 {
   extern int FirstTime;
@@ -554,7 +554,7 @@ KC_initialize(uiContext d, char *arg)
                          ´Á»ú¤Ë¤Ê¤é¤Ê¤¯¤Æ¤â¤¤¤¤¤·¡£ */
 
 		      {
-			extern standalone;
+			extern int standalone;
 			standalone = RkwGetServerName() ? 0 : 1;
 		      }
 
@@ -688,7 +688,7 @@ freeExtra(void)
 }
 
 static
-KC_finalize(uiContext d, char *arg)
+int KC_finalize(uiContext d, char *arg)
      /* ARGSUSED */
 {
   extern int FirstTime;
@@ -763,14 +763,14 @@ KC_finalize(uiContext d, char *arg)
 }
 
 static
-KC_setWidth(uiContext d, caddr_t arg)
+int KC_setWidth(uiContext d, caddr_t arg)
 {
   d->ncolumns = (int)(POINTERINT)arg;
   return 0;
 }
 
 static
-KC_setBunsetsuKugiri(uiContext d, caddr_t arg)
+int KC_setBunsetsuKugiri(uiContext d, caddr_t arg)
      /* ARGSUSED */
 {
   cannaconf.BunsetsuKugiri = (int)(POINTERINT)arg;
@@ -796,7 +796,7 @@ static long gflags[] = {
 };
 
 static
-KC_changeMode(uiContext d, wcKanjiStatusWithValue *arg)
+int KC_changeMode(uiContext d, wcKanjiStatusWithValue *arg)
 {
   coreContext cc;
   yomiContext yc;
@@ -896,7 +896,7 @@ KC_changeMode(uiContext d, wcKanjiStatusWithValue *arg)
 }
 
 static
-baseModeP(uiContext d)
+int baseModeP(uiContext d)
 {
   extern KanjiModeRec alpha_mode, empty_mode;
 
@@ -917,7 +917,7 @@ baseModeP(uiContext d)
 
 */
 
-escapeToBasicStat(uiContext d, int how)
+int escapeToBasicStat(uiContext d, int how)
 {
   int len = 0, totallen = 0;
   WCHAR_T *p = d->buffer_return;
@@ -949,21 +949,21 @@ escapeToBasicStat(uiContext d, int how)
 }
 
 static
-KC_setUFunc(uiContext d, caddr_t arg)
+int KC_setUFunc(uiContext d, caddr_t arg)
      /* ARGSUSED */
 {
-  extern howToBehaveInCaseOfUndefKey;
+  extern int howToBehaveInCaseOfUndefKey;
 
   howToBehaveInCaseOfUndefKey = (int)(POINTERINT)arg;
   return 0;
 }
 
 static
-KC_setModeInfoStyle(uiContext d, caddr_t arg)
+int KC_setModeInfoStyle(uiContext d, caddr_t arg)
      /* ARGSUSED */
 {
   int	tmpval;
-  extern howToReturnModeInfo;
+  extern int howToReturnModeInfo;
 
   if ((tmpval = (int)(POINTERINT)arg) < 0 || tmpval > MaxModeInfoStyle)
     return(-1);
@@ -972,7 +972,7 @@ KC_setModeInfoStyle(uiContext d, caddr_t arg)
 }
 
 static
-KC_setHexInputStyle(uiContext d, caddr_t arg)
+int KC_setHexInputStyle(uiContext d, caddr_t arg)
      /* ARGSUSED */
 {
   cannaconf.hexCharacterDefiningStyle = (int)(POINTERINT)arg;
@@ -980,7 +980,7 @@ KC_setHexInputStyle(uiContext d, caddr_t arg)
 }
 
 static
-KC_inhibitHankakuKana(uiContext d, caddr_t arg)
+int KC_inhibitHankakuKana(uiContext d, caddr_t arg)
      /* ARGSUSED */
 {
   cannaconf.InhibitHankakuKana = (int)(POINTERINT)arg;
@@ -991,7 +991,7 @@ KC_inhibitHankakuKana(uiContext d, caddr_t arg)
 extern void popTourokuMode (uiContext);
 
 static
-popTourokuWithGLineClear(uiContext d, int retval, mode_context env)
+int popTourokuWithGLineClear(uiContext d, int retval, mode_context env)
      /* ARGSUSED */
 {
   tourokuContext tc;
@@ -1011,7 +1011,7 @@ popTourokuWithGLineClear(uiContext d, int retval, mode_context env)
 #endif
 
 static
-KC_defineKanji(uiContext d, wcKanjiStatusWithValue *arg)
+int KC_defineKanji(uiContext d, wcKanjiStatusWithValue *arg)
 {
 #ifdef NO_EXTEND_MENU
   return 0;
@@ -1123,7 +1123,7 @@ makeAllContextToBeClosed(int flag)
 }
 
 static
-KC_kakutei(uiContext d, wcKanjiStatusWithValue *arg)
+int KC_kakutei(uiContext d, wcKanjiStatusWithValue *arg)
 {
   d->buffer_return = arg->buffer;
   d->n_buffer = arg->n_buffer;
@@ -1141,7 +1141,7 @@ KC_kakutei(uiContext d, wcKanjiStatusWithValue *arg)
 }
 
 static
-KC_kill(uiContext d, wcKanjiStatusWithValue *arg)
+int KC_kill(uiContext d, wcKanjiStatusWithValue *arg)
 {
   d->buffer_return = arg->buffer;
   d->n_buffer = arg->n_buffer;
@@ -1156,7 +1156,7 @@ KC_kill(uiContext d, wcKanjiStatusWithValue *arg)
 }
 
 static
-KC_modekeys(uiContext d, unsigned char *arg)
+int KC_modekeys(uiContext d, unsigned char *arg)
 {
   int n = 0;
   int i;
@@ -1178,16 +1178,16 @@ KC_modekeys(uiContext d, unsigned char *arg)
 }
 
 static
-KC_queryMode(uiContext d, WCHAR_T *arg)
+int KC_queryMode(uiContext d, WCHAR_T *arg)
 {
   return queryMode(d, arg);
 }
 
 static
-KC_queryConnection(uiContext d, unsigned char *arg)
+int KC_queryConnection(uiContext d, unsigned char *arg)
      /* ARGSUSED */
 {
-  extern defaultContext;
+  extern int defaultContext;
 
   if (defaultContext != -1) {
     return 1;
@@ -1198,14 +1198,14 @@ KC_queryConnection(uiContext d, unsigned char *arg)
 }
 
 static
-KC_setServerName(uiContext d, unsigned char *arg)
+int KC_setServerName(uiContext d, unsigned char *arg)
      /* ARGSUSED */
 {
   return RkSetServerName((char *)arg);
 }
 
 static
-KC_parse(uiContext d, char **arg)
+int KC_parse(uiContext d, char **arg)
      /* ARGSUSED */
 {
   initWarningMesg();
@@ -1220,7 +1220,7 @@ KC_parse(uiContext d, char **arg)
 int yomiInfoLevel = 0;
 
 static
-KC_yomiInfo(uiContext d, int arg)
+int KC_yomiInfo(uiContext d, int arg)
      /* ARGSUSED */
 {
   yomiInfoLevel = arg;
@@ -1228,7 +1228,7 @@ KC_yomiInfo(uiContext d, int arg)
 }
 
 static
-KC_storeYomi(uiContext d, wcKanjiStatusWithValue *arg)
+int KC_storeYomi(uiContext d, wcKanjiStatusWithValue *arg)
 {
   extern KanjiModeRec yomi_mode, cy_mode;
   coreContext cc;
@@ -1282,7 +1282,7 @@ KC_storeYomi(uiContext d, wcKanjiStatusWithValue *arg)
 char *initFileSpecified = (char *)NULL;
 
 static
-KC_setInitFileName(uiContext d, char *arg)
+int KC_setInitFileName(uiContext d, char *arg)
      /* ARGSUSED */
 {
   int len;
@@ -1308,7 +1308,7 @@ KC_setInitFileName(uiContext d, char *arg)
 }
 
 static
-KC_do(uiContext d, wcKanjiStatusWithValue *arg)
+int KC_do(uiContext d, wcKanjiStatusWithValue *arg)
 {
   d->buffer_return = arg->buffer;
   d->n_buffer = arg->n_buffer;
@@ -1337,7 +1337,7 @@ KC_do(uiContext d, wcKanjiStatusWithValue *arg)
 
  */
 
-_do_func_slightly(uiContext d, int fnum, mode_context mode_c, KanjiMode c_mode)
+int _do_func_slightly(uiContext d, int fnum, mode_context mode_c, KanjiMode c_mode)
 {
   wcKanjiStatus ks;
   long gfback;
@@ -1390,7 +1390,7 @@ _do_func_slightly(uiContext d, int fnum, mode_context mode_c, KanjiMode c_mode)
 #endif
 
 static
-callCallback(uiContext d, int res)
+int callCallback(uiContext d, int res)
 {
   struct callback *cbp;
 
@@ -1418,7 +1418,7 @@ callCallback(uiContext d, int res)
   return res;
 }
 
-_doFunc(uiContext d, int fnum)
+int _doFunc(uiContext d, int fnum)
 {
   int res = 0, tmpres, ginfo = 0;
   int reallyThrough = 1;
@@ -1513,7 +1513,7 @@ _doFunc(uiContext d, int fnum)
   return res;
 }
 
-_afterDoFunc(uiContext d, int retval)
+int _afterDoFunc(uiContext d, int retval)
 {
   int res = retval;
   wcKanjiStatus   *kanji_status_return = d->kanji_status_return;
@@ -1543,16 +1543,16 @@ _afterDoFunc(uiContext d, int retval)
 
  */
 
-doFunc(uiContext d, int fnum)
+int doFunc(uiContext d, int fnum)
 {
   return _afterDoFunc(d, _doFunc(d, fnum));
 }
 
 static
-KC_getContext(uiContext d, int arg)
+int KC_getContext(uiContext d, int arg)
      /* ARGSUSED */
 {
-  extern defaultContext, defaultBushuContext;
+  extern int defaultContext, defaultBushuContext;
 
   switch (arg)
     {
@@ -1569,7 +1569,7 @@ KC_getContext(uiContext d, int arg)
 }
 
 static
-KC_closeUIContext(uiContext d, wcKanjiStatusWithValue *arg)
+int KC_closeUIContext(uiContext d, wcKanjiStatusWithValue *arg)
 {
   extern struct ModeNameRecs ModeNames[];
   int ret;
@@ -1616,7 +1616,7 @@ getYomiContext(uiContext d)
 }
 
 static
-KC_inhibitChangeMode(uiContext d, int arg)
+int KC_inhibitChangeMode(uiContext d, int arg)
 {
   yomiContext yc;
 
@@ -1636,7 +1636,7 @@ KC_inhibitChangeMode(uiContext d, int arg)
 }
 
 static
-KC_letterRestriction(uiContext d, int arg)
+int KC_letterRestriction(uiContext d, int arg)
 {
   yomiContext yc;
 
@@ -1651,7 +1651,7 @@ KC_letterRestriction(uiContext d, int arg)
 }
 
 static
-countColumns(WCHAR_T *str)
+int countColumns(WCHAR_T *str)
 {
   int len = 0;
   WCHAR_T *p;
@@ -1674,7 +1674,7 @@ countColumns(WCHAR_T *str)
 }
 
 static
-KC_queryMaxModeStr(uiContext d, int arg)
+int KC_queryMaxModeStr(uiContext d, int arg)
      /* ARGSUSED */
 {
   int i, maxcolumns = 0, ncols;
@@ -1744,7 +1744,7 @@ int kanjiFinalize (char ***mes)
 
 static unsigned char context_table[100] = "";
 
-createKanjiContext()
+int createKanjiContext()
 {
   int i;
 
@@ -1992,7 +1992,7 @@ static int
 KC_changeServer(uiContext d, char *arg)
 /* ARGSUSED */
 {
-  extern defaultContext;
+  extern int defaultContext;
   char *p;
 
   if (!arg) {
@@ -2201,49 +2201,49 @@ KC_attributeInfo(uiContext d, char *arg)
 /* KanjiControl¤Î¸Ä¡¹¤ÎÀ©¸æ´Ø¿ô¤Ø¤Î¥Ý¥¤¥ó¥¿ */
 
 static int (*kctlfunc[MAX_KC_REQUEST])(...) = {
-  KC_initialize,
-  KC_finalize,
-  KC_changeMode,
-  KC_setWidth,
-  KC_setUFunc,
-  KC_setBunsetsuKugiri,
-  KC_setModeInfoStyle,
-  KC_setHexInputStyle,
-  KC_inhibitHankakuKana,
-  KC_defineKanji,
-  KC_kakutei,
-  KC_kill,
-  KC_modekeys,
-  KC_queryMode,
-  KC_queryConnection,
-  KC_setServerName,
-  KC_parse,
-  KC_yomiInfo,
-  KC_storeYomi,
-  KC_setInitFileName,
-  KC_do,
-  KC_getContext,
-  KC_closeUIContext,
-  KC_inhibitChangeMode,
-  KC_letterRestriction,
-  KC_queryMaxModeStr,
-  KC_setListCallback,
-  KC_setVerbose,
-  KC_lispInteraction,
-  KC_disconnectServer,
-  KC_setAppName,
-  KC_debugmode,
-  KC_debugyomi,
-  KC_keyconvCallback,
-  KC_queryPhono,
-  KC_changeServer,
-  KC_setUserInfo,
-  KC_queryCustom,
-  KC_closeAllContext,
-  KC_attributeInfo,
+  (int (*)(...))KC_initialize,
+  (int (*)(...))KC_finalize,
+  (int (*)(...))KC_changeMode,
+  (int (*)(...))KC_setWidth,
+  (int (*)(...))KC_setUFunc,
+  (int (*)(...))KC_setBunsetsuKugiri,
+  (int (*)(...))KC_setModeInfoStyle,
+  (int (*)(...))KC_setHexInputStyle,
+  (int (*)(...))KC_inhibitHankakuKana,
+  (int (*)(...))KC_defineKanji,
+  (int (*)(...))KC_kakutei,
+  (int (*)(...))KC_kill,
+  (int (*)(...))KC_modekeys,
+  (int (*)(...))KC_queryMode,
+  (int (*)(...))KC_queryConnection,
+  (int (*)(...))KC_setServerName,
+  (int (*)(...))KC_parse,
+  (int (*)(...))KC_yomiInfo,
+  (int (*)(...))KC_storeYomi,
+  (int (*)(...))KC_setInitFileName,
+  (int (*)(...))KC_do,
+  (int (*)(...))KC_getContext,
+  (int (*)(...))KC_closeUIContext,
+  (int (*)(...))KC_inhibitChangeMode,
+  (int (*)(...))KC_letterRestriction,
+  (int (*)(...))KC_queryMaxModeStr,
+  (int (*)(...))KC_setListCallback,
+  (int (*)(...))KC_setVerbose,
+  (int (*)(...))KC_lispInteraction,
+  (int (*)(...))KC_disconnectServer,
+  (int (*)(...))KC_setAppName,
+  (int (*)(...))KC_debugmode,
+  (int (*)(...))KC_debugyomi,
+  (int (*)(...))KC_keyconvCallback,
+  (int (*)(...))KC_queryPhono,
+  (int (*)(...))KC_changeServer,
+  (int (*)(...))KC_setUserInfo,
+  (int (*)(...))KC_queryCustom,
+  (int (*)(...))KC_closeAllContext,
+  (int (*)(...))KC_attributeInfo,
 };
 
-kanjiControl(int request, uiContext d, caddr_t arg)
+int kanjiControl(int request, uiContext d, caddr_t arg)
 {
   return kctlfunc[request](d, arg);
 }
diff --git a/src/add-ons/input_server/methods/canna/lib/keydef.c b/src/add-ons/input_server/methods/canna/lib/keydef.c
index 5f93c04dad..b1e1cd0fb6 100644
--- a/src/add-ons/input_server/methods/canna/lib/keydef.c
+++ b/src/add-ons/input_server/methods/canna/lib/keydef.c
@@ -25,7 +25,7 @@
 /************************************************************************/
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: keydef.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -63,8 +63,8 @@ static void clearAllFuncSequence(void);
 static void freeKeySeqMode(KanjiMode m);
 static void freeMap(struct map *m);
 static void clearAllKeySequence(void);
-static specialen(unsigned char *block);
-static to_write_act(int depth, int keysize, int actsize, unsigned singleAct);
+static int specialen(unsigned char *block);
+static int to_write_act(int depth, int keysize, int actsize, unsigned singleAct);
 static struct map *regist_map(KanjiMode tbl, unsigned char *keybuff, unsigned char *actbuff, int depth);
 static int regist_key_hash(unsigned char *tbl_ptr, unsigned char *keybuff, unsigned char *actbuff);
 static int copyMultiSequence(unsigned char key, KanjiMode old_tbl, KanjiMode new_tbl);
@@ -133,7 +133,7 @@ unsigned char *alphamap, *emptymap;
 
 */
 
-initKeyTables(void)
+int initKeyTables(void)
 {
   int i;
   unsigned char *tbl;
@@ -204,7 +204,7 @@ restoreDefaultKeymaps(void)
 
 extern int nothermodes;
 
-changeKeyfunc(int modenum, int key, int fnum, unsigned char *actbuff, unsigned char *keybuff)
+int changeKeyfunc(int modenum, int key, int fnum, unsigned char *actbuff, unsigned char *keybuff)
 {
   int i, retval = 0;
   unsigned char *p, *q;
@@ -339,7 +339,7 @@ changeKeyOnSomeCondition(KanjiMode mode, int key, int fnum, unsigned char *actbu
  *
  */
 
-changeKeyfuncOfAll(int key, int fnum, unsigned char *actbuff, unsigned char *keybuff)
+int changeKeyfuncOfAll(int key, int fnum, unsigned char *actbuff, unsigned char *keybuff)
 {
   extern extraFunc *extrafuncp;
   extraFunc *ep;
@@ -583,7 +583,7 @@ clearAllKeySequence(void)
 }
 
 static
-specialen(unsigned char *block)
+int specialen(unsigned char *block)
 {
   int i;
   for (i = 0 ; block[i] != 255 ;) {
@@ -595,7 +595,7 @@ specialen(unsigned char *block)
 }
 
 static
-to_write_act(int depth, int keysize, int actsize, unsigned singleAct)
+int to_write_act(int depth, int keysize, int actsize, unsigned singleAct)
 {
   if (depth == (keysize -2)) {
     if (actsize > 1){
@@ -865,7 +865,7 @@ freeMultiSequence(unsigned char key, KanjiMode tbl)
   free(map);
 }
 
-askQuitKey(unsigned key)
+int askQuitKey(unsigned key)
 {
   if (defaultmap[key] == CANNA_FN_Quit) {
     return 1; /* ¼õ¤±¼è¤Ã¤¿key¤Ïquit¤À¤Ã¤¿¡£ */
diff --git a/src/add-ons/input_server/methods/canna/lib/kigo.c b/src/add-ons/input_server/methods/canna/lib/kigo.c
index ffb76fce5d..4e0ca27dff 100644
--- a/src/add-ons/input_server/methods/canna/lib/kigo.c
+++ b/src/add-ons/input_server/methods/canna/lib/kigo.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static	char	rcs_id[] = "@(#) 102.1 $Id: kigo.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static	char	rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include	"canna.h"
@@ -53,19 +53,19 @@ static	char	rcs_id[] = "@(#) 102.1 $Id: kigo.c,v 1.1 2004/12/23 21:23:49 korli E
 
 static void freeKigoContext(ichiranContext kc);
 static void makeKigoGlineStatus(uiContext d);
-static makeKigoInfo(uiContext d, int headkouho);
-static kigoIchiranExitCatch(uiContext d, int retval, mode_context env);
-static kigoIchiranQuitCatch(uiContext d, int retval, mode_context env);
-static KigoNop(uiContext d);
-static KigoForwardKouho(uiContext d);
-static KigoBackwardKouho(uiContext d);
-static KigoPreviousKouhoretsu(uiContext d);
-static KigoNextKouhoretsu(uiContext d);
-static KigoBeginningOfKouho(uiContext d);
-static KigoEndOfKouho(uiContext d);
-static KigoKakutei(uiContext d);
-static KigoBangoKouho(uiContext d);
-static KigoQuit(uiContext d);
+static int makeKigoInfo(uiContext d, int headkouho);
+static int kigoIchiranExitCatch(uiContext d, int retval, mode_context env);
+static int kigoIchiranQuitCatch(uiContext d, int retval, mode_context env);
+static int KigoNop(uiContext d);
+static int KigoForwardKouho(uiContext d);
+static int KigoBackwardKouho(uiContext d);
+static int KigoPreviousKouhoretsu(uiContext d);
+static int KigoNextKouhoretsu(uiContext d);
+static int KigoBeginningOfKouho(uiContext d);
+static int KigoEndOfKouho(uiContext d);
+static int KigoKakutei(uiContext d);
+static int KigoBangoKouho(uiContext d);
+static int KigoQuit(uiContext d);
 
 static int kigo_curIkouho;
 
@@ -128,7 +128,7 @@ freeKigoContext(ichiranContext kc)
  * µ­¹æ°ìÍ÷¹Ô¤òºî¤ë
  */
 inline
-getKigoContext(uiContext d, canna_callback_t everyTimeCallback, canna_callback_t exitCallback, canna_callback_t quitCallback, canna_callback_t auxCallback)
+int getKigoContext(uiContext d, canna_callback_t everyTimeCallback, canna_callback_t exitCallback, canna_callback_t quitCallback, canna_callback_t auxCallback)
 {
   extern KanjiModeRec kigo_mode;
   ichiranContext kc;
@@ -230,7 +230,7 @@ makeKigoGlineStatus(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0
  */
 static
-makeKigoInfo(uiContext d, int headkouho)
+int makeKigoInfo(uiContext d, int headkouho)
 {
   ichiranContext kc = (ichiranContext)d->modec;
   WCHAR_T *gptr;
@@ -300,7 +300,7 @@ makeKigoInfo(uiContext d, int headkouho)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-kigoIchiranExitCatch(uiContext d, int retval, mode_context env)
+int kigoIchiranExitCatch(uiContext d, int retval, mode_context env)
      /* ARGSUSED */
 {
   popCallback(d);
@@ -313,7 +313,7 @@ kigoIchiranExitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-kigoIchiranQuitCatch(uiContext d, int retval, mode_context env)
+int kigoIchiranQuitCatch(uiContext d, int retval, mode_context env)
      /* ARGSUSED */
 {
   popCallback(d);
@@ -323,7 +323,7 @@ kigoIchiranQuitCatch(uiContext d, int retval, mode_context env)
 }
 #endif /* NO_EXTEND_MENU */
 
-KigoIchiran(uiContext d)
+int KigoIchiran(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -349,7 +349,7 @@ KigoIchiran(uiContext d)
  * °ú¤­¿ô	uiContext
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
-makeKigoIchiran(uiContext d, int major_mode)
+int makeKigoIchiran(uiContext d, int major_mode)
 {
   ichiranContext kc;
   int            headkouho;
@@ -414,7 +414,7 @@ makeKigoIchiran(uiContext d, int major_mode)
 }
 
 static
-KigoNop(uiContext d)
+int KigoNop(uiContext d)
 {
   /* currentModeInfo ¤Ç¥â¡¼¥É¾ðÊó¤¬É¬¤ºÊÖ¤ë¤è¤¦¤Ë¥À¥ß¡¼¤Î¥â¡¼¥É¤òÆþ¤ì¤Æ¤ª¤¯ */
   d->majorMode = d->minorMode = CANNA_MODE_AlphaMode;
@@ -431,7 +431,7 @@ KigoNop(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0
  */
 static
-KigoForwardKouho(uiContext d)
+int KigoForwardKouho(uiContext d)
 {
   ichiranContext kc = (ichiranContext)d->modec;
   int  headkouho;
@@ -463,7 +463,7 @@ KigoForwardKouho(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0
  */
 static
-KigoBackwardKouho(uiContext d)
+int KigoBackwardKouho(uiContext d)
 {
   ichiranContext kc = (ichiranContext)d->modec;
   int  headkouho;
@@ -494,7 +494,7 @@ KigoBackwardKouho(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0
  */
 static
-KigoPreviousKouhoretsu(uiContext d)
+int KigoPreviousKouhoretsu(uiContext d)
 {
   ichiranContext kc = (ichiranContext)d->modec;
   int headkouho;
@@ -524,7 +524,7 @@ KigoPreviousKouhoretsu(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0
  */
 static
-KigoNextKouhoretsu(uiContext d)
+int KigoNextKouhoretsu(uiContext d)
 {
   ichiranContext kc = (ichiranContext)d->modec;
   int headkouho;
@@ -554,7 +554,7 @@ KigoNextKouhoretsu(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0
  */
 static
-KigoBeginningOfKouho(uiContext d)
+int KigoBeginningOfKouho(uiContext d)
 {
   ichiranContext kc = (ichiranContext)d->modec;
 
@@ -575,7 +575,7 @@ KigoBeginningOfKouho(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0
  */
 static
-KigoEndOfKouho(uiContext d)
+int KigoEndOfKouho(uiContext d)
 {
   ichiranContext kc = (ichiranContext)d->modec;
 
@@ -599,7 +599,7 @@ KigoEndOfKouho(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0
  */
 static
-KigoKakutei(uiContext d)
+int KigoKakutei(uiContext d)
 {
   ichiranContext kc = (ichiranContext)d->modec;
 
@@ -685,7 +685,7 @@ KigoBangoKouho(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0
  */
 static
-KigoQuit(uiContext d)
+int KigoQuit(uiContext d)
 {
   ichiranContext kc = (ichiranContext)d->modec;
   BYTE fl = kc->flags;
diff --git a/src/add-ons/input_server/methods/canna/lib/kigomap.h b/src/add-ons/input_server/methods/canna/lib/kigomap.h
index 5278f2b758..b429ca0d95 100644
--- a/src/add-ons/input_server/methods/canna/lib/kigomap.h
+++ b/src/add-ons/input_server/methods/canna/lib/kigomap.h
@@ -22,13 +22,14 @@
 // Modified by T.Murai
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char kigomap_id[] = "@(#) 102.1 $Id: kigomap.h,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char kigomap_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #ifdef NO_EXTEND_MENU
 static struct funccfunc kigo_funcs[] = {{0, 0},};
 #else
-extern DoFuncSequence(),UseOtherKeymap();
+extern int DoFuncSequence();
+extern int UseOtherKeymap();
 
 static struct funccfunc kigo_funcs[] = {
   {CANNA_FN_KigouMode		,KigoQuit		},
@@ -51,7 +52,7 @@ static struct funccfunc kigo_funcs[] = {
 };
 #endif /* NO_EXTEND_MENU */
 
-extern searchfunc(...);
+extern int searchfunc(...);
 
 KanjiModeRec kigo_mode = {
   searchfunc,
diff --git a/src/add-ons/input_server/methods/canna/lib/lisp.c b/src/add-ons/input_server/methods/canna/lib/lisp.c
index fade2774ed..9bb689907f 100644
--- a/src/add-ons/input_server/methods/canna/lib/lisp.c
+++ b/src/add-ons/input_server/methods/canna/lib/lisp.c
@@ -25,7 +25,7 @@
 /************************************************************************/
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcsid[] = "$Id: lisp.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcsid[] = "$Id$";
 #endif
 
 /* 
@@ -51,11 +51,11 @@ extern void (*keyconvCallback)(...);
 //static int CANNA_mbstowcs(WCHAR_T *dest, char *src, int destlen);
 static void fillMenuEntry(void);
 static void intr(int sig);
-static initIS(void);
+static int initIS(void);
 static void finIS(void);
-static identifySequence(unsigned c, int *val);
+static int identifySequence(unsigned c, int *val);
 static int alloccell(void);
-static allocarea(void);
+static int allocarea(void);
 static void freearea(void);
 static list getatmz(char *name);
 static list mkatm(char *name);
@@ -67,8 +67,8 @@ static void numerr(char *fn, list arg);
 static void lisp_strerr(char *fn, list arg);
 static list Lread(int n);
 static list read1(void);
-static skipspaces(void);
-static zaplin(void);
+static int skipspaces(void);
+static int zaplin(void);
 static list newcons(void);
 static list newsymbol(char *name);
 static void print(list l);
@@ -76,12 +76,12 @@ static list ratom(void);
 static list ratom2(int a);
 static list rstring(void);
 static list rcharacter(void);
-static isnum(char *name);
+static int isnum(char *name);
 static void untyi(int c);
 static int tyi(void);
 static int tyipeek(void);
 static void prins(char *s);
-static isterm(int c);
+static int isterm(int c);
 static void push(list value);
 static void pop(int x);
 static list pop1(void);
@@ -625,7 +625,7 @@ intr(int sig)
 
 */
 
-parse_string(char *str)
+int parse_string(char *str)
 {
   char *readbufbk;
 
@@ -808,7 +808,7 @@ static int nseq;
 static int seqline;
 
 static
-initIS(void)
+int initIS(void)
 {
   SeqToID *p;
   char *s;
@@ -926,7 +926,7 @@ finIS(void) /* identifySequence ¤ËÍѤ¤¤¿¥á¥â¥ê»ñ¸»¤ò³«Êü
 #define END	 0
 
 static
-identifySequence(unsigned c, int *val)
+int identifySequence(unsigned c, int *val)
 {
   int nextline;
 
@@ -971,7 +971,7 @@ alloccell(void)
 /* ¤¦¤Þ¤¯¹Ô¤«¤Ê¤«¤Ã¤¿¤é£°¤òÊÖ¤¹ */
 
 static
-allocarea(void)
+int allocarea(void)
 {
   /* ¤Þ¤º¤Ï¥»¥ëÎΰè */
   if (alloccell()) {
@@ -1058,8 +1058,8 @@ mkatm(char *name)
   newatom->value = (*name == ':') ? (list)temp : (list)UNBOUND;
   newatom->plist = NIL;			/* set null plist	*/
   newatom->ftype = UNDEF;		/* set undef func-type	*/
-  newatom->func  = (list (*)())0;	/* Don't kill this line	*/
-  newatom->valfunc  = (list (*)())0;	/* Don't kill this line	*/
+  newatom->func  = (list (*)(...))0;	/* Don't kill this line	*/
+  newatom->valfunc  = (list (*)(...))0;	/* Don't kill this line	*/
   newatom->hlink = NIL;		/* no hash linking	*/
   newatom->mid = -1;
   newatom->fid = -1;
@@ -1305,7 +1305,7 @@ read1(void)
 	if eof read then return NO	*/
 
 static
-skipspaces(void)
+int skipspaces(void)
 {
   int c;
 
@@ -1330,7 +1330,7 @@ skipspaces(void)
 	if eof read then return NO	*/
 
 static
-zaplin(void)
+int zaplin(void)
 {
 	int c;
 
@@ -1420,7 +1420,7 @@ ratom(void)
 /* read atom with the first one character -
 	check if the token is numeric or pure symbol & return proper value */
 
-static isnum();
+static int isnum();
 
 static list 
 ratom2(int a)
@@ -1688,7 +1688,7 @@ static void prins(char *s)
 /* isterm -
 	check if the character is terminating the lisp expression	*/
 
-static isterm(int c)
+static int isterm(int c)
 {
 	if (c <= ' ')
 		return(YES);
@@ -3062,16 +3062,16 @@ Lputd(int n)
   }
   if (null(body)) {
     symp->ftype = UNDEF;
-    symp->func = (list (*)())UNDEF;
+    symp->func = (list (*)(...))UNDEF;
   }
   else if (consp(body)) {
     if (car(body) == _MACRO) {
       symp->ftype = MACRO;
-      symp->func = (list (*)())body;
+      symp->func = (list (*)(...))body;
     }
     else {
       symp->ftype = EXPR;
-      symp->func = (list (*)())body;
+      symp->func = (list (*)(...))body;
     }
   }
   return(a);
@@ -3529,7 +3529,7 @@ Ldefsym(void)
   int i, ncand, group;
   WCHAR_T cand[1024], *p, *mcand, **acand, key, xkey;
   int mcandsize;
-  extern nkeysup;
+  extern int nkeysup;
   extern keySupplement keysup[];
 
   form = sp[0];
@@ -4557,57 +4557,57 @@ DEFVAR(Vchikuji_debug, VTorNIL, int, chikuji_debug)
 /* Lisp ¤Î´Ø¿ô¤È C ¤Î´Ø¿ô¤ÎÂбþɽ */
 
 static struct atomdefs initatom[] = {
-  {"quote"		,SPECIAL,Lquote		},
-  {"setq"		,SPECIAL,Lsetq		},
-  {"set"		,SUBR	,Lset		},
-  {"equal"		,SUBR	,Lequal		},
-  {"="			,SUBR	,Lequal		},
-  {">"			,SUBR	,Lgreaterp	},
-  {"<"			,SUBR	,Llessp		},
-  {"progn"		,SPECIAL,Lprogn		},
-  {"eq"			,SUBR	,Leq   		},
-  {"cond"		,SPECIAL,Lcond		},
-  {"null"		,SUBR	,Lnull		},
-  {"not"		,SUBR	,Lnull		},
-  {"and"		,SPECIAL,Land		},
-  {"or"			,SPECIAL,Lor		},
-  {"+"			,SUBR	,Lplus		},
-  {"-"			,SUBR	,Ldiff		},
-  {"*"			,SUBR	,Ltimes		},
-  {"/"			,SUBR	,Lquo		},
-  {"%"			,SUBR	,Lrem		},
-  {"gc"			,SUBR	,Lgc		},
-  {"load"		,SUBR	,Lload		},
-  {"list"		,SUBR	,Llist		},
-  {"sequence"		,SUBR	,Llist		},
-  {"defun"		,SPECIAL,Ldefun		},
-  {"defmacro"		,SPECIAL,Ldefmacro	},
-  {"cons"		,SUBR	,Lcons		},
-  {"car"		,SUBR	,Lcar		},
-  {"cdr"		,SUBR	,Lcdr		},
-  {"atom"		,SUBR	,Latom		},
-  {"let"		,CMACRO	,Llet		},
-  {"if"			,CMACRO	,Lif		},
-  {"boundp"		,SUBR	,Lboundp	},
-  {"fboundp"		,SUBR	,Lfboundp	},
-  {"getenv"		,SUBR	,Lgetenv	},
-  {"copy-symbol"	,SUBR	,Lcopysym	},
-  {"concat"		,SUBR	,Lconcat	},
-  {S_FN_UseDictionary	,SUBR	,Lusedic	},
-  {S_SetModeDisp	,SUBR	,Lmodestr	},
-  {S_SetKey		,SUBR	,Lsetkey	},
-  {S_GSetKey		,SUBR	,Lgsetkey	},
-  {S_UnbindKey		,SUBR	,Lunbindkey	},
-  {S_GUnbindKey		,SUBR	,Lgunbindkey	},
-  {S_DefMode		,SPECIAL,Ldefmode	},
-  {S_DefSymbol		,SPECIAL,Ldefsym	},
+  {"quote"		,SPECIAL,(list(*)(...))Lquote		},
+  {"setq"		,SPECIAL,(list(*)(...))Lsetq		},
+  {"set"		,SUBR	,(list(*)(...))Lset		},
+  {"equal"		,SUBR	,(list(*)(...))Lequal		},
+  {"="			,SUBR	,(list(*)(...))Lequal		},
+  {">"			,SUBR	,(list(*)(...))Lgreaterp	},
+  {"<"			,SUBR	,(list(*)(...))Llessp		},
+  {"progn"		,SPECIAL,(list(*)(...))Lprogn		},
+  {"eq"			,SUBR	,(list(*)(...))Leq   		},
+  {"cond"		,SPECIAL,(list(*)(...))Lcond		},
+  {"null"		,SUBR	,(list(*)(...))Lnull		},
+  {"not"		,SUBR	,(list(*)(...))Lnull		},
+  {"and"		,SPECIAL,(list(*)(...))Land		},
+  {"or"			,SPECIAL,(list(*)(...))Lor		},
+  {"+"			,SUBR	,(list(*)(...))Lplus		},
+  {"-"			,SUBR	,(list(*)(...))Ldiff		},
+  {"*"			,SUBR	,(list(*)(...))Ltimes		},
+  {"/"			,SUBR	,(list(*)(...))Lquo		},
+  {"%"			,SUBR	,(list(*)(...))Lrem		},
+  {"gc"			,SUBR	,(list(*)(...))Lgc		},
+  {"load"		,SUBR	,(list(*)(...))Lload		},
+  {"list"		,SUBR	,(list(*)(...))Llist		},
+  {"sequence"		,SUBR	,(list(*)(...))Llist		},
+  {"defun"		,SPECIAL,(list(*)(...))Ldefun		},
+  {"defmacro"		,SPECIAL,(list(*)(...))Ldefmacro	},
+  {"cons"		,SUBR	,(list(*)(...))Lcons		},
+  {"car"		,SUBR	,(list(*)(...))Lcar		},
+  {"cdr"		,SUBR	,(list(*)(...))Lcdr		},
+  {"atom"		,SUBR	,(list(*)(...))Latom		},
+  {"let"		,CMACRO	,(list(*)(...))Llet		},
+  {"if"			,CMACRO	,(list(*)(...))Lif		},
+  {"boundp"		,SUBR	,(list(*)(...))Lboundp	},
+  {"fboundp"		,SUBR	,(list(*)(...))Lfboundp	},
+  {"getenv"		,SUBR	,(list(*)(...))Lgetenv	},
+  {"copy-symbol"	,SUBR	,(list(*)(...))Lcopysym	},
+  {"concat"		,SUBR	,(list(*)(...))Lconcat	},
+  {S_FN_UseDictionary	,SUBR	,(list(*)(...))Lusedic	},
+  {S_SetModeDisp	,SUBR	,(list(*)(...))Lmodestr	},
+  {S_SetKey		,SUBR	,(list(*)(...))Lsetkey	},
+  {S_GSetKey		,SUBR	,(list(*)(...))Lgsetkey	},
+  {S_UnbindKey		,SUBR	,(list(*)(...))Lunbindkey	},
+  {S_GUnbindKey		,SUBR	,(list(*)(...))Lgunbindkey	},
+  {S_DefMode		,SPECIAL,(list(*)(...))Ldefmode	},
+  {S_DefSymbol		,SPECIAL,(list(*)(...))Ldefsym	},
 #ifndef NO_EXTEND_MENU
-  {S_DefSelection	,SPECIAL,Ldefselection	},
-  {S_DefMenu		,SPECIAL,Ldefmenu	},
+  {S_DefSelection	,SPECIAL,(list(*)(...))Ldefselection	},
+  {S_DefMenu		,SPECIAL,(list(*)(...))Ldefmenu	},
 #endif
-  {S_SetInitFunc	,SUBR	,Lsetinifunc	},
-  {S_defEscSequence	,SUBR	,LdefEscSeq	},
-  {S_defXKeysym		,SUBR	,LdefXKeysym	},
+  {S_SetInitFunc	,SUBR	,(list(*)(...))Lsetinifunc	},
+  {S_defEscSequence	,SUBR	,(list(*)(...))LdefEscSeq	},
+  {S_defXKeysym		,SUBR	,(list(*)(...))LdefXKeysym	},
   {0			,UNDEF	,0		}, /* DUMMY */
 };
 
@@ -4633,66 +4633,66 @@ deflispfunc(void)
 /* ÊÑ¿ôɽ */
 
 static struct cannavardefs cannavars[] = {
-  {S_VA_RomkanaTable		,Vromkana},
-  {S_VA_EnglishTable		,Venglish},
-  {S_VA_CursorWrap		,Vcursorw},
-  {S_VA_SelectDirect		,Vselectd},
-  {S_VA_NumericalKeySelect	,Vnumeric},
-  {S_VA_BunsetsuKugiri		,Vbunsets},
-  {S_VA_CharacterBasedMove	,Vcharact},
-  {S_VA_ReverseWidely		,Vreverse},
-  {S_VA_ReverseWord		,VreverseWord},
-  {S_VA_Gakushu			,Vgakushu},
-  {S_VA_QuitIfEOIchiran		,Vquitich},
-  {S_VA_KakuteiIfEOBunsetsu	,Vkakutei},
-  {S_VA_StayAfterValidate	,Vstayaft},
-  {S_VA_BreakIntoRoman		,Vbreakin},
-  {S_VA_NHenkanForIchiran	,Vnhenkan},
-  {S_VA_GrammaticalQuestion	,Vgrammati},
-  {"gramatical-question"	,Vgrammati}, /* °ÊÁ°¤Î¥¹¥Ú¥ë¥ß¥¹¤ÎµßºÑ */
-  {S_VA_ForceKana		,Vforceka},
-  {S_VA_KouhoCount		,Vkouhoco},
-  {S_VA_Auto			,Vauto},
-  {S_VA_LearnNumericalType	,VlearnNumTy},
-  {S_VA_BackspaceBehavesAsQuit	,VBSasQuit},
-  {S_VA_InhibitListCallback	,Vinhibi},
-  {S_VA_nKouhoBunsetsu		,Vnkouhobunsetsu},
-  {S_VA_keepCursorPosition	,Vkeepcupos},
-  {S_VA_CannaVersion		,VCannaVersion},
-  {S_VA_Abandon			,VAbandon},
-  {S_VA_HexDirect		,VHexStyle},
-  {S_VA_ProtocolVersion		,VProtoVer},
-  {S_VA_ServerVersion		,VServVer},
-  {S_VA_ServerName		,VServName},
-  {S_VA_CannaDir		,VCannaDir},
-  {S_VA_Kojin			,VKojin},
-  {S_VA_IndexHankaku	       	,VIndexHankaku},
-  {S_VA_IndexSeparator	       	,VIndexSeparator},
-  {S_VA_AllowNextInput		,VAllowNext},
-  {S_VA_doKatakanaGakushu	,VkanaGaku},
-  {S_VA_doHiraganaGakushu	,VhiraGaku},
+  {S_VA_RomkanaTable		,(list(*)(...))Vromkana},
+  {S_VA_EnglishTable		,(list(*)(...))Venglish},
+  {S_VA_CursorWrap		,(list(*)(...))Vcursorw},
+  {S_VA_SelectDirect		,(list(*)(...))Vselectd},
+  {S_VA_NumericalKeySelect	,(list(*)(...))Vnumeric},
+  {S_VA_BunsetsuKugiri		,(list(*)(...))Vbunsets},
+  {S_VA_CharacterBasedMove	,(list(*)(...))Vcharact},
+  {S_VA_ReverseWidely		,(list(*)(...))Vreverse},
+  {S_VA_ReverseWord		,(list(*)(...))VreverseWord},
+  {S_VA_Gakushu			,(list(*)(...))Vgakushu},
+  {S_VA_QuitIfEOIchiran		,(list(*)(...))Vquitich},
+  {S_VA_KakuteiIfEOBunsetsu	,(list(*)(...))Vkakutei},
+  {S_VA_StayAfterValidate	,(list(*)(...))Vstayaft},
+  {S_VA_BreakIntoRoman		,(list(*)(...))Vbreakin},
+  {S_VA_NHenkanForIchiran	,(list(*)(...))Vnhenkan},
+  {S_VA_GrammaticalQuestion	,(list(*)(...))Vgrammati},
+  {"gramatical-question"	,(list(*)(...))Vgrammati}, /* °ÊÁ°¤Î¥¹¥Ú¥ë¥ß¥¹¤ÎµßºÑ */
+  {S_VA_ForceKana		,(list(*)(...))Vforceka},
+  {S_VA_KouhoCount		,(list(*)(...))Vkouhoco},
+  {S_VA_Auto			,(list(*)(...))Vauto},
+  {S_VA_LearnNumericalType	,(list(*)(...))VlearnNumTy},
+  {S_VA_BackspaceBehavesAsQuit	,(list(*)(...))VBSasQuit},
+  {S_VA_InhibitListCallback	,(list(*)(...))Vinhibi},
+  {S_VA_nKouhoBunsetsu		,(list(*)(...))Vnkouhobunsetsu},
+  {S_VA_keepCursorPosition	,(list(*)(...))Vkeepcupos},
+  {S_VA_CannaVersion		,(list(*)(...))VCannaVersion},
+  {S_VA_Abandon			,(list(*)(...))VAbandon},
+  {S_VA_HexDirect		,(list(*)(...))VHexStyle},
+  {S_VA_ProtocolVersion		,(list(*)(...))VProtoVer},
+  {S_VA_ServerVersion		,(list(*)(...))VServVer},
+  {S_VA_ServerName		,(list(*)(...))VServName},
+  {S_VA_CannaDir		,(list(*)(...))VCannaDir},
+  {S_VA_Kojin			,(list(*)(...))VKojin},
+  {S_VA_IndexHankaku	       	,(list(*)(...))VIndexHankaku},
+  {S_VA_IndexSeparator	       	,(list(*)(...))VIndexSeparator},
+  {S_VA_AllowNextInput		,(list(*)(...))VAllowNext},
+  {S_VA_doKatakanaGakushu	,(list(*)(...))VkanaGaku},
+  {S_VA_doHiraganaGakushu	,(list(*)(...))VhiraGaku},
 #ifdef	DEFINE_SOMETHING
-  {S_VA_chikuji_debug		,Vchikuji_debug},
+  {S_VA_chikuji_debug		,(list(*)(...))Vchikuji_debug},
 #endif	/* DEFINE_SOMETHING */
-  {S_VA_ChikujiContinue		,VChikujiContinue},
-  {S_VA_RenbunContinue		,VRenbunContinue},
-  {S_VA_MojishuContinue		,VMojishuContinue},
-  {S_VA_ChikujiRealBackspace	,VcRealBS},
-  {S_VA_nDisconnectServer	,Vndisconnect},
-  {S_VA_ignoreCase		,VIgnoreCase},
-  {S_VA_RomajiYuusen		,VRomajiYuusen},
-  {S_VA_AutoSync		,VAutoSync},
-  {S_VA_QuicklyEscape		,VQuicklyEscape},
-  {S_VA_InhibitHanKana		,VInhibitHankana},
-  {S_VA_CodeInput		,VCodeInput},
+  {S_VA_ChikujiContinue		,(list(*)(...))VChikujiContinue},
+  {S_VA_RenbunContinue		,(list(*)(...))VRenbunContinue},
+  {S_VA_MojishuContinue		,(list(*)(...))VMojishuContinue},
+  {S_VA_ChikujiRealBackspace	,(list(*)(...))VcRealBS},
+  {S_VA_nDisconnectServer	,(list(*)(...))Vndisconnect},
+  {S_VA_ignoreCase		,(list(*)(...))VIgnoreCase},
+  {S_VA_RomajiYuusen		,(list(*)(...))VRomajiYuusen},
+  {S_VA_AutoSync		,(list(*)(...))VAutoSync},
+  {S_VA_QuicklyEscape		,(list(*)(...))VQuicklyEscape},
+  {S_VA_InhibitHanKana		,(list(*)(...))VInhibitHankana},
+  {S_VA_CodeInput		,(list(*)(...))VCodeInput},
 #ifdef WIN_CANLISP
-  {"remote-group"		,VremoteGroup},
-  {"local-group"		,VlocalGroup},
-  {"candlist-initial-width"     ,VcandInitWidth},
-  {"candlist-initial-height"    ,VcandInitHeight},
-  {"candlist-max-width"         ,VcandMaxWidth},
-  {"candlist-max-height"        ,VcandMaxHeight},
-  {"toolbar-icon-size"          ,VstatusSize},
+  {"remote-group"		,(list(*)(...))VremoteGroup},
+  {"local-group"		,(list(*)(...))VlocalGroup},
+  {"candlist-initial-width"     ,(list(*)(...))VcandInitWidth},
+  {"candlist-initial-height"    ,(list(*)(...))VcandInitHeight},
+  {"candlist-max-width"         ,(list(*)(...))VcandMaxWidth},
+  {"candlist-max-height"        ,(list(*)(...))VcandMaxHeight},
+  {"toolbar-icon-size"          ,(list(*)(...))VstatusSize},
 #endif
   {0				,0},
 };
diff --git a/src/add-ons/input_server/methods/canna/lib/mode.c b/src/add-ons/input_server/methods/canna/lib/mode.c
index aaefdac2b1..8e7a006066 100644
--- a/src/add-ons/input_server/methods/canna/lib/mode.c
+++ b/src/add-ons/input_server/methods/canna/lib/mode.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: mode.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -220,7 +220,7 @@ japaneseMode(uiContext d)
 
  */
 
-JapaneseMode(uiContext d)
+int JapaneseMode(uiContext d)
 {
   coreContext cc = (coreContext)d->modec;
   yomiContext yc = (yomiContext)cc->next;
@@ -234,7 +234,7 @@ JapaneseMode(uiContext d)
   return 0;
 }
 
-AlphaMode(uiContext d)
+int AlphaMode(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -249,7 +249,7 @@ AlphaMode(uiContext d)
   }
 }
 
-HenkanNyuryokuMode(uiContext d)
+int HenkanNyuryokuMode(uiContext d)
 {
   extern KanjiModeRec empty_mode;
   yomiContext yc = (yomiContext)d->modec;
@@ -273,7 +273,7 @@ HenkanNyuryokuMode(uiContext d)
   return 0;
 }
 
-queryMode(uiContext d, WCHAR_T *arg)
+int queryMode(uiContext d, WCHAR_T *arg)
 {
   coreContext cc = (coreContext)d->modec;
   WCHAR_T *mode_str = (WCHAR_T *)0;
@@ -357,7 +357,7 @@ queryMode(uiContext d, WCHAR_T *arg)
  *
  */
 
-changeModeName(int modeid, char *str)
+int changeModeName(int modeid, char *str)
 {
   extraFunc *ep;
 
diff --git a/src/add-ons/input_server/methods/canna/lib/multi.c b/src/add-ons/input_server/methods/canna/lib/multi.c
index 8b9f61df6d..684e63d190 100644
--- a/src/add-ons/input_server/methods/canna/lib/multi.c
+++ b/src/add-ons/input_server/methods/canna/lib/multi.c
@@ -25,7 +25,7 @@
 /************************************************************************/
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char m_s_map_id[] = "@(#) 102.1 $Id: multi.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char m_s_map_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -34,7 +34,7 @@ static char m_s_map_id[] = "@(#) 102.1 $Id: multi.c,v 1.1 2004/12/23 21:23:49 ko
 #define NONE CANNA_FN_Undefined
 
 static unsigned char *showChar(int c);
-static _DoFuncSequence(uiContext d, BYTE *keytbl, BYTE key);
+static int _DoFuncSequence(uiContext d, BYTE *keytbl, BYTE key);
 
 extern int askQuitKey();
 extern int checkGLineLen();
@@ -100,7 +100,7 @@ showChar(int c)
   return Gkey;
 }
 
-UseOtherKeymap(uiContext d)
+int UseOtherKeymap(uiContext d)
 {
   struct map *p;
   unsigned char showKey[10];
@@ -125,7 +125,7 @@ UseOtherKeymap(uiContext d)
 }
 
 static
-_DoFuncSequence(uiContext d, BYTE *keytbl, BYTE key)
+int _DoFuncSequence(uiContext d, BYTE *keytbl, BYTE key)
 {
   int res, total_res, ginfo = 0;
   int prevEchoLen = -1, prevRevPos, prevRevLen;
@@ -233,7 +233,7 @@ _DoFuncSequence(uiContext d, BYTE *keytbl, BYTE key)
   return total_res;
 }
 
-DoFuncSequence(uiContext d)
+int DoFuncSequence(uiContext d)
 {
   return _DoFuncSequence(d, (BYTE *)NULL, (BYTE)NULL);
 }
diff --git a/src/add-ons/input_server/methods/canna/lib/onoff.c b/src/add-ons/input_server/methods/canna/lib/onoff.c
index 431072b200..2ecc58894c 100644
--- a/src/add-ons/input_server/methods/canna/lib/onoff.c
+++ b/src/add-ons/input_server/methods/canna/lib/onoff.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static	char	rcs_id[] = "@(#) 102.1 $Id: onoff.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static	char	rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include	<errno.h>
@@ -31,9 +31,9 @@ static	char	rcs_id[] = "@(#) 102.1 $Id: onoff.c,v 1.1 2004/12/23 21:23:49 korli
 #define ICHISIZE 9
 
 static void popOnOffMode(uiContext d);
-static makeOnOffIchiran(uiContext d, int nelem, int bangomax, int currentkouho, unsigned char *status);
-static OnOffSelect(uiContext d);
-static OnOffKakutei(uiContext d);
+static int makeOnOffIchiran(uiContext d, int nelem, int bangomax, int currentkouho, unsigned char *status);
+static int OnOffSelect(uiContext d);
+static int OnOffKakutei(uiContext d);
 
 static int makeOnOffIchiran();
 
@@ -70,7 +70,7 @@ popOnOffMode(uiContext d)
 /*
  * ¸õÊä°ìÍ÷¹Ô¤òºî¤ë
  */
-selectOnOff(uiContext d, WCHAR_T **buf, int *ck, int nelem, int bangomax, int currentkouho, unsigned char *status, int (*everyTimeCallback )(...), int (*exitCallback )(...), int (*quitCallback )(...), int (*auxCallback )(...))
+int selectOnOff(uiContext d, WCHAR_T **buf, int *ck, int nelem, int bangomax, int currentkouho, unsigned char *status, int (*everyTimeCallback )(...), int (*exitCallback )(...), int (*quitCallback )(...), int (*auxCallback )(...))
 {
   extern KanjiModeRec onoff_mode;
   ichiranContext oc;
@@ -78,7 +78,10 @@ selectOnOff(uiContext d, WCHAR_T **buf, int *ck, int nelem, int bangomax, int cu
   ichiranContext newIchiranContext();
 
   if(pushCallback(d, d->modec,
-	everyTimeCallback, exitCallback, quitCallback, auxCallback) == 0) {
+	(int(*)(_uiContext*, int, _coreContextRec*))everyTimeCallback,
+	(int(*)(_uiContext*, int, _coreContextRec*))exitCallback,
+	(int(*)(_uiContext*, int, _coreContextRec*))quitCallback,
+	(int(*)(_uiContext*, int, _coreContextRec*))auxCallback) == 0) {
     jrKanjiError = "malloc (pushCallback) \244\307\244\255\244\336\244\273\244\363\244\307\244\267\244\277";
                                        /* ¤Ç¤­¤Þ¤»¤ó¤Ç¤·¤¿ */
     return(NG);
@@ -256,7 +259,7 @@ makeOnOffIchiran(uiContext d, int nelem, int bangomax, int currentkouho, unsigne
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
 static
-OnOffSelect(uiContext d)
+int OnOffSelect(uiContext d)
 {
   ichiranContext oc = (ichiranContext)d->modec;
   mountContext mc = (mountContext)oc->next;
@@ -287,7 +290,7 @@ OnOffSelect(uiContext d)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
 static
-OnOffKakutei(uiContext d)
+int OnOffKakutei(uiContext d)
 {
   ichiranContext oc = (ichiranContext)d->modec;
   int retval = 0;
diff --git a/src/add-ons/input_server/methods/canna/lib/onoffmap.h b/src/add-ons/input_server/methods/canna/lib/onoffmap.h
index 793903368a..dd6c7265ce 100644
--- a/src/add-ons/input_server/methods/canna/lib/onoffmap.h
+++ b/src/add-ons/input_server/methods/canna/lib/onoffmap.h
@@ -46,7 +46,7 @@ static struct funccfunc onoff_funcs[] = {
 };
 #endif /* NO_EXTEND_MENU */
 
-extern searchfunc(...);
+extern int searchfunc(...);
 KanjiModeRec onoff_mode = {
   searchfunc,
   default_kmap,
diff --git a/src/add-ons/input_server/methods/canna/lib/parse.c b/src/add-ons/input_server/methods/canna/lib/parse.c
index 5a749eb098..87486d6d14 100644
--- a/src/add-ons/input_server/methods/canna/lib/parse.c
+++ b/src/add-ons/input_server/methods/canna/lib/parse.c
@@ -25,7 +25,7 @@
 /************************************************************************/
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: parse.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include <stdio.h>
@@ -50,7 +50,7 @@ static char CANNA_rcfilename[BUF_LEN] = "";
 
 extern int ckverbose;
 
-extern YYparse_by_rcfilename();
+extern int YYparse_by_rcfilename();
 
 /* cfuncdef
 
@@ -72,10 +72,10 @@ extern YYparse_by_rcfilename();
 #define OBSOLETE_FILEENVNAME "IROHAFILE"
 #define OBSOLETE_HOSTENVNAME "IROHAHOST"
 
-static DISPLAY_to_hostname(char *name, char *buf, int bufsize);
+static int DISPLAY_to_hostname(char *name, char *buf, int bufsize);
 
 static
-make_initfilename(void)
+int make_initfilename(void)
 {
   if(!CANNA_initfilename) {
     CANNA_initfilename = (char *)malloc(1024);
diff --git a/src/add-ons/input_server/methods/canna/lib/romaji.c b/src/add-ons/input_server/methods/canna/lib/romaji.c
index 8a6885e2e2..ab99027d84 100644
--- a/src/add-ons/input_server/methods/canna/lib/romaji.c
+++ b/src/add-ons/input_server/methods/canna/lib/romaji.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: romaji.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -44,56 +44,56 @@ static char rcs_id[] = "@(#) 102.1 $Id: romaji.c,v 1.1 2004/12/23 21:23:49 korli
 extern struct RkRxDic *romajidic, *englishdic;
 
 static struct RkRxDic *OpenRoma(char *table);
-static makePhonoOnBuffer(uiContext d, yomiContext yc, unsigned char key, int flag, int english);
-static growDakuonP(WCHAR_T ch);
-static KanaYomiInsert(uiContext d);
-static howFarToGoBackward(yomiContext yc);
-static howFarToGoForward(yomiContext yc);
+static int makePhonoOnBuffer(uiContext d, yomiContext yc, unsigned char key, int flag, int english);
+static int growDakuonP(WCHAR_T ch);
+static int KanaYomiInsert(uiContext d);
+static int howFarToGoBackward(yomiContext yc);
+static int howFarToGoForward(yomiContext yc);
 static int YomiBackward(uiContext d);
-static YomiNop(uiContext d);
-static YomiForward(uiContext d);
-static YomiBeginningOfLine(uiContext d);
-static YomiEndOfLine(uiContext d);
-static appendYomi2Yomi(yomiContext yom, yomiContext yc);
+static int YomiNop(uiContext d);
+static int YomiForward(uiContext d);
+static int YomiBeginningOfLine(uiContext d);
+static int YomiEndOfLine(uiContext d);
+static int appendYomi2Yomi(yomiContext yom, yomiContext yc);
 static int YomiDeletePrevious(uiContext d);
 static int YomiDeleteNext(uiContext d);
 static int YomiKillToEndOfLine(uiContext d);
 static int YomiQuit(uiContext d);
-static simplePopCallback(uiContext d, int retval, mode_context env);
-static exitYomiQuotedInsert(uiContext d, int retval, mode_context env);
-static YomiInsertQuoted(uiContext d);
-static yomiquotedfunc(uiContext d, KanjiMode mode, int whattodo, int key, int fnum);
-static ConvertAsHex(uiContext d);
-static everySupkey(uiContext d, int retval, mode_context env);
-static exitSupkey(uiContext d, int retval, mode_context env);
-static quitSupkey(uiContext d, int retval, mode_context env);
+static int simplePopCallback(uiContext d, int retval, mode_context env);
+static int exitYomiQuotedInsert(uiContext d, int retval, mode_context env);
+static int YomiInsertQuoted(uiContext d);
+static int yomiquotedfunc(uiContext d, KanjiMode mode, int whattodo, int key, int fnum);
+static int ConvertAsHex(uiContext d);
+static int everySupkey(uiContext d, int retval, mode_context env);
+static int exitSupkey(uiContext d, int retval, mode_context env);
+static int quitSupkey(uiContext d, int retval, mode_context env);
 static int YomiHenkan(uiContext d);
 static int YomiHenkanNaive(uiContext d);
 static int YomiHenkanOrNothing(uiContext d);
-static YomiBaseHira(uiContext d);
-static YomiBaseKata(uiContext d);
-static YomiBaseEisu(uiContext d);
-static YomiBaseZen(uiContext d);
-static YomiBaseHan(uiContext d);
-static YomiBaseKana(uiContext d);
-static YomiBaseKakutei(uiContext d);
-static YomiBaseHenkan(uiContext d);
-static YomiJishu(uiContext d, int fn);
+static int YomiBaseHira(uiContext d);
+static int YomiBaseKata(uiContext d);
+static int YomiBaseEisu(uiContext d);
+static int YomiBaseZen(uiContext d);
+static int YomiBaseHan(uiContext d);
+static int YomiBaseKana(uiContext d);
+static int YomiBaseKakutei(uiContext d);
+static int YomiBaseHenkan(uiContext d);
+static int YomiJishu(uiContext d, int fn);
 static int chikujiEndBun(uiContext d);
 static void replaceEnglish(uiContext d, yomiContext yc, int start, int end, int RKflag, int engflag);
-static YomiNextJishu(uiContext d);
-static YomiPreviousJishu(uiContext d);
-static YomiKanaRotate(uiContext d);
-static YomiRomajiRotate(uiContext d);
-static YomiCaseRotateForward(uiContext d);
-static YomiZenkaku(uiContext d);
-static YomiHankaku(uiContext d);
-static YomiHiraganaJishu(uiContext d);
-static YomiKatakanaJishu(uiContext d);
-static YomiRomajiJishu(uiContext d);
-static YomiToLower(uiContext d);
-static YomiToUpper(uiContext d);
-static YomiCapitalize(uiContext d);
+static int YomiNextJishu(uiContext d);
+static int YomiPreviousJishu(uiContext d);
+static int YomiKanaRotate(uiContext d);
+static int YomiRomajiRotate(uiContext d);
+static int YomiCaseRotateForward(uiContext d);
+static int YomiZenkaku(uiContext d);
+static int YomiHankaku(uiContext d);
+static int YomiHiraganaJishu(uiContext d);
+static int YomiKatakanaJishu(uiContext d);
+static int YomiRomajiJishu(uiContext d);
+static int YomiToLower(uiContext d);
+static int YomiToUpper(uiContext d);
+static int YomiCapitalize(uiContext d);
 
 int forceRomajiFlushYomi (uiContext);
 static int chikujiEndBun (uiContext);
@@ -451,7 +451,7 @@ extern char basepath[];
   return retval;
 }
 
-RomkanaInit(void)
+int RomkanaInit(void)
 {
   extern char *RomkanaTable, *EnglishTable;
   extern extraFunc *extrafuncp;
@@ -679,7 +679,7 @@ void
 RomkanaFin(void)
 {
   extern char *RomkanaTable, *EnglishTable;
-  extern nkeysup;
+  extern int nkeysup;
   int i;
 
   /* ¥í¡¼¥Þ»ú¤«¤ÊÊÑ´¹¥Æ¡¼¥Ö¥ë¤Î¥¯¥í¡¼¥º */
@@ -851,7 +851,7 @@ popYomiMode(uiContext d)
  */
 
 inline
-checkIfYomiExit(uiContext d, int retval)
+int checkIfYomiExit(uiContext d, int retval)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -880,7 +880,7 @@ checkIfYomiExit(uiContext d, int retval)
 }
 
 static
-checkIfYomiQuit(uiContext d, int retval)
+int checkIfYomiQuit(uiContext d, int retval)
 /* ARGSUSED */
 {
 #ifdef QUIT_IN_YOMI /* ¥³¥á¥ó¥È¥¢¥¦¥È¤¹¤ëÌÜŪ¤Î ifdef */
@@ -1023,7 +1023,7 @@ restoreChikujiIfBaseChikuji(yomiContext yc)
 
 int YomiInsert (uiContext);
 
-YomiInsert(uiContext d)
+int YomiInsert(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
   int subst, autoconvert = (yc->generalFlags & CANNA_YOMI_CHIKUJI_MODE);
@@ -1191,10 +1191,10 @@ YomiInsert(uiContext d)
 
 int findSup (WCHAR_T);
 
-findSup(WCHAR_T key)
+int findSup(WCHAR_T key)
 {
   int i;
-  extern nkeysup;
+  extern int nkeysup;
 
   for (i = 0 ; i < nkeysup ; i++) {
     if (key == keysup[i].key) {
@@ -1217,7 +1217,7 @@ findSup(WCHAR_T key)
  */
 
 static
-makePhonoOnBuffer(uiContext d, yomiContext yc, unsigned char key, int flag, int english)
+int makePhonoOnBuffer(uiContext d, yomiContext yc, unsigned char key, int flag, int english)
 {
   int i, n, m, t, sm, henkanflag, prevflag, cond;
   int retval = 0;
@@ -1483,9 +1483,9 @@ makePhonoOnBuffer(uiContext d, yomiContext yc, unsigned char key, int flag, int
 #define DAKUON_FV 2
 
 inline
-dakuonP(WCHAR_T ch)
+int dakuonP(WCHAR_T ch)
 {
-  static dakuon_first_time = 1;
+  static int dakuon_first_time = 1;
   static WCHAR_T hv, fv;
 
   if (dakuon_first_time) { /* ÆüËܸì¸ÇÍ­¤Î½èÍý */
@@ -1528,10 +1528,10 @@ dakuonP(WCHAR_T ch)
 #define GROW_HV 3
 
 static
-growDakuonP(WCHAR_T ch)
+int growDakuonP(WCHAR_T ch)
 {
   /* ÂùÅÀ¤¬Â³¤¯²ÄǽÀ­¤¬¤¢¤ëʸ»ú¤Î½èÍý (¤¦¡¢¤«¡Á¤È¡¢¤Ï¡Á¤Û) */
-  static dakuon_first_time = 1;
+  static int dakuon_first_time = 1;
   static WCHAR_T wu, wka, wto, wha, who;
 
   if (dakuon_first_time) { /* ÆüËܸì¸ÇÍ­¤Î½èÍý */
@@ -1566,7 +1566,7 @@ growDakuonP(WCHAR_T ch)
 }
 
 static
-KanaYomiInsert(uiContext d)
+int KanaYomiInsert(uiContext d)
 {
   static WCHAR_T kana[3], *kanap;
   WCHAR_T buf1[KANAYOMIINSERT_BUFLEN], buf2[KANAYOMIINSERT_BUFLEN];
@@ -1720,7 +1720,7 @@ moveStrings(WCHAR_T *str, BYTE *attr, int start, int end, int distance)
 }
 
 static
-howFarToGoBackward(yomiContext yc)
+int howFarToGoBackward(yomiContext yc)
 {
   if (yc->kCurs <= yc->cStartp) {
     return 0;
@@ -1742,7 +1742,7 @@ howFarToGoBackward(yomiContext yc)
 }
 
 static
-howFarToGoForward(yomiContext yc)
+int howFarToGoForward(yomiContext yc)
 {
   if (yc->kCurs == yc->kEndp) {
     return 0;
@@ -1828,7 +1828,7 @@ YomiBackward(uiContext d)
 }
 
 static
-YomiNop(uiContext d)
+int YomiNop(uiContext d)
 {
   /* currentModeInfo ¤Ç¥â¡¼¥É¾ðÊó¤¬É¬¤ºÊÖ¤ë¤è¤¦¤Ë¥À¥ß¡¼¤Î¥â¡¼¥É¤òÆþ¤ì¤Æ¤ª¤¯ */
   d->majorMode = d->minorMode = CANNA_MODE_AlphaMode;
@@ -1838,7 +1838,7 @@ YomiNop(uiContext d)
 }
 
 static
-YomiForward(uiContext d)
+int YomiForward(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
   int howManyMove;
@@ -1895,10 +1895,10 @@ YomiForward(uiContext d)
   return 0;
 }
 
-static YomiBeginningOfLine (uiContext);
+int static YomiBeginningOfLine (uiContext);
 
 static
-YomiBeginningOfLine(uiContext d)
+int YomiBeginningOfLine(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -1930,7 +1930,7 @@ YomiBeginningOfLine(uiContext d)
 
 
 static
-YomiEndOfLine(uiContext d)
+int YomiEndOfLine(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -1994,7 +1994,7 @@ forceRomajiFlushYomi(uiContext d)
  *
  */
 
-RomajiFlushYomi(uiContext d, WCHAR_T *b, int bsize)
+int RomajiFlushYomi(uiContext d, WCHAR_T *b, int bsize)
 {
   int ret;
   yomiContext yc = (yomiContext)d->modec;
@@ -2128,7 +2128,7 @@ appendTan2Yomi(tanContext tan, yomiContext yc)
 }
 
 static
-appendYomi2Yomi(yomiContext yom, yomiContext yc)
+int appendYomi2Yomi(yomiContext yom, yomiContext yc)
 {
   int rlen, klen;
 
@@ -2641,7 +2641,7 @@ RomajiClearYomi(uiContext d)
   }
 }
 
-YomiExit(uiContext d, int retval)
+int YomiExit(uiContext d, int retval)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -2717,7 +2717,7 @@ RomajiStoreYomi(uiContext d, WCHAR_T *kana, WCHAR_T *roma)
 
 */
 
-KanaDeletePrevious(uiContext d)
+int KanaDeletePrevious(uiContext d)
 {
   int howManyDelete;
   int prevflag;
@@ -2826,7 +2826,7 @@ YomiDeletePrevious(uiContext d)
   return 0;
 }
 
-static YomiDeleteNext (uiContext);
+static int YomiDeleteNext (uiContext);
 
 static int
 YomiDeleteNext(uiContext d)
@@ -2899,7 +2899,7 @@ YomiDeleteNext(uiContext d)
   return 0;
 }
 
-static YomiKillToEndOfLine (uiContext);
+static int YomiKillToEndOfLine (uiContext);
 
 static int
 YomiKillToEndOfLine(uiContext d)
@@ -2930,7 +2930,7 @@ YomiKillToEndOfLine(uiContext d)
   return 0;
 }
 
-static YomiQuit (uiContext);
+static int YomiQuit (uiContext);
 
 static int
 YomiQuit(uiContext d)
@@ -2967,7 +2967,7 @@ newCoreContext(void)
 }
 
 static
-simplePopCallback(uiContext d, int retval, mode_context env)
+int simplePopCallback(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d);
@@ -2975,7 +2975,7 @@ simplePopCallback(uiContext d, int retval, mode_context env)
   return retval;
 }
 
-alphaMode(uiContext d)
+int alphaMode(uiContext d)
 {
   extern KanjiModeRec alpha_mode;
   coreContext cc;
@@ -3010,10 +3010,10 @@ alphaMode(uiContext d)
 
  */
 
-static exitYomiQuotedInsert (uiContext, int, mode_context);
+static int exitYomiQuotedInsert (uiContext, int, mode_context);
 
 static
-exitYomiQuotedInsert(uiContext d, int retval, mode_context env)
+int exitYomiQuotedInsert(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d);
@@ -3021,7 +3021,7 @@ exitYomiQuotedInsert(uiContext d, int retval, mode_context env)
 }
 
 static
-YomiInsertQuoted(uiContext d)
+int YomiInsertQuoted(uiContext d)
 {
   unsigned char ch;
   coreContext cc = (coreContext)d->modec;
@@ -3051,10 +3051,10 @@ YomiInsertQuoted(uiContext d)
   }
 }
 
-static yomiquotedfunc (uiContext, KanjiMode, int, int, int);
+static int yomiquotedfunc (uiContext, KanjiMode, int, int, int);
 
 static
-yomiquotedfunc(uiContext d, KanjiMode mode, int whattodo, int key, int fnum)
+int yomiquotedfunc(uiContext d, KanjiMode mode, int whattodo, int key, int fnum)
      /* ARGSUSED */
 {
   switch (whattodo) {
@@ -3100,7 +3100,7 @@ yomiQuotedInsertMode(uiContext d)
   return;
 }
 
-YomiQuotedInsert(uiContext d)
+int YomiQuotedInsert(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -3138,7 +3138,7 @@ mapAsKuten(uiContext d)
   char tmpbuf[4];
   WCHAR_T *hexbuf;
   WCHAR_T buf[2];
-  static allowTwoByte = 1;
+  static int allowTwoByte = 1;
 
   tmpbuf[0] = tmpbuf[1] = tmpbuf[2] = tmpbuf[3] = '\0';
 
@@ -3230,7 +3230,7 @@ mapAsHex(uiContext d)
   char tmpbuf[8], *a;
   WCHAR_T *hexbuf;
   WCHAR_T buf[2];
-  static allowTwoByte = 1;
+  static int allowTwoByte = 1;
   extern struct CannaConfig cannaconf;
 
   if (yc->kCurs < yc->cmark) {
@@ -3354,10 +3354,10 @@ mapAsHex(uiContext d)
 
   */
 
-static ConvertAsHex (uiContext);
+static int ConvertAsHex (uiContext);
 
 static
-ConvertAsHex(uiContext d)
+int ConvertAsHex(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
   extern struct CannaConfig cannaconf;
@@ -3407,7 +3407,7 @@ ConvertAsHex(uiContext d)
 #ifdef WIN
 static 
 #endif
-cvtAsHex(uiContext d, WCHAR_T *buf, WCHAR_T *hexbuf, int hexlen)
+int cvtAsHex(uiContext d, WCHAR_T *buf, WCHAR_T *hexbuf, int hexlen)
 {
   int i;
   char tmpbuf[5], *a, *b;
@@ -3450,7 +3450,7 @@ cvtAsHex(uiContext d, WCHAR_T *buf, WCHAR_T *hexbuf, int hexlen)
   }
 }
 
-convertAsHex(uiContext d)
+int convertAsHex(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -3481,7 +3481,7 @@ inline void
 replaceSup(int ind, int n)
 {
   int i, group;
-  extern nkeysup;
+  extern int nkeysup;
 
   group = keysup[ind].groupid;
   for (i = 0 ; i < nkeysup ; i++) {
@@ -3491,10 +3491,10 @@ replaceSup(int ind, int n)
   }
 }
 
-static everySupkey (uiContext, int, mode_context);
+static int everySupkey (uiContext, int, mode_context);
 
 static
-everySupkey(uiContext d, int retval, mode_context env)
+int everySupkey(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   ichiranContext ic = (ichiranContext)d->modec;
@@ -3509,10 +3509,10 @@ everySupkey(uiContext d, int retval, mode_context env)
   return retval;
 }
 
-static exitSupkey (uiContext, int, mode_context);
+static int exitSupkey (uiContext, int, mode_context);
 
 static
-exitSupkey(uiContext d, int retval, mode_context env)
+int exitSupkey(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   yomiContext yc;
@@ -3550,10 +3550,10 @@ exitSupkey(uiContext d, int retval, mode_context env)
 #endif
 }
 
-static quitSupkey (uiContext, int, mode_context);
+static int quitSupkey (uiContext, int, mode_context);
 
 static
-quitSupkey(uiContext d, int retval, mode_context env)
+int quitSupkey(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* °ìÍ÷¤ò¥Ý¥Ã¥× */
@@ -3562,11 +3562,11 @@ quitSupkey(uiContext d, int retval, mode_context env)
   return retval;
 }
 
-selectKeysup(uiContext d, yomiContext yc, int ind)
+int selectKeysup(uiContext d, yomiContext yc, int ind)
 {
   int retval;
   ichiranContext ic;
-  extern nkeysup;
+  extern int nkeysup;
 
   yc->cursup = 0;
   retval = selectOne(d, keysup[ind].cand, &(yc->cursup), keysup[ind].ncand,
@@ -3608,7 +3608,7 @@ selectKeysup(uiContext d, yomiContext yc, int ind)
  */
 
 inline
-regionGairaigo(yomiContext yc, int s, int e)
+int regionGairaigo(yomiContext yc, int s, int e)
 {
   if ((yc->kAttr[s] & SENTOU) && (yc->kAttr[e] & SENTOU)) {
     return 1;
@@ -3636,7 +3636,7 @@ containGairaigo(yomiContext yc)
   return 0;
 }
 
-containUnconvertedKey(yomiContext yc)
+int containUnconvertedKey(yomiContext yc)
 {
   int i, s, e;
 
@@ -3667,7 +3667,7 @@ containUnconvertedKey(yomiContext yc)
  * Ìá¤êÃÍ	Àµ¾ï½ªÎ»»þ 0	°Û¾ï½ªÎ»»þ -1
  */
 
-static YomiHenkan (uiContext);
+static int YomiHenkan (uiContext);
 
 static int
 YomiHenkan(uiContext d)
@@ -3736,7 +3736,7 @@ YomiHenkan(uiContext d)
   return 0;
 }
 
-static YomiHenkanNaive (uiContext);
+static int YomiHenkanNaive (uiContext);
 
 static int
 YomiHenkanNaive(uiContext d)
@@ -3752,7 +3752,7 @@ YomiHenkanNaive(uiContext d)
   }
 }
 
-static YomiHenkanOrNothing (uiContext);
+static int YomiHenkanOrNothing (uiContext);
 
 static int
 YomiHenkanOrNothing(uiContext d)
@@ -3770,14 +3770,16 @@ YomiHenkanOrNothing(uiContext d)
 
 /* ¥Ù¡¼¥¹Ê¸»ú¤ÎÀÚ¤êÂؤ¨ */
 
-extern EmptyBaseHira (uiContext), EmptyBaseKata (uiContext); 
-extern EmptyBaseEisu (uiContext);
-extern EmptyBaseZen (uiContext), EmptyBaseHan (uiContext);
+extern int EmptyBaseHira (uiContext);
+extern int EmptyBaseKata (uiContext); 
+extern int EmptyBaseEisu (uiContext);
+extern int EmptyBaseZen (uiContext);
+extern int EmptyBaseHan (uiContext);
 
-static YomiBaseHira (uiContext);
+static int YomiBaseHira (uiContext);
 
 static
-YomiBaseHira(uiContext d)
+int YomiBaseHira(uiContext d)
 {
   (void)RomajiFlushYomi(d, d->genbuf, ROMEBUFSIZE);
   (void)EmptyBaseHira(d);
@@ -3785,10 +3787,10 @@ YomiBaseHira(uiContext d)
   return 0;
 }
 
-static YomiBaseKata (uiContext);
+static int YomiBaseKata (uiContext);
 
 static
-YomiBaseKata(uiContext d)
+int YomiBaseKata(uiContext d)
 {
   (void)RomajiFlushYomi(d, d->genbuf, ROMEBUFSIZE);
   (void)EmptyBaseKata(d);
@@ -3796,10 +3798,10 @@ YomiBaseKata(uiContext d)
   return 0;
 }
 
-static YomiBaseEisu (uiContext);
+static int YomiBaseEisu (uiContext);
 
 static
-YomiBaseEisu(uiContext d)
+int YomiBaseEisu(uiContext d)
 {
   (void)RomajiFlushYomi(d, d->genbuf, ROMEBUFSIZE);
   (void)EmptyBaseEisu(d);
@@ -3807,10 +3809,10 @@ YomiBaseEisu(uiContext d)
   return 0;
 }
 
-static YomiBaseZen (uiContext);
+static int YomiBaseZen (uiContext);
 
 static
-YomiBaseZen(uiContext d)
+int YomiBaseZen(uiContext d)
 {
   (void)RomajiFlushYomi(d, d->genbuf, ROMEBUFSIZE);
   (void)EmptyBaseZen(d);
@@ -3818,10 +3820,10 @@ YomiBaseZen(uiContext d)
   return 0;
 }
 
-static YomiBaseHan (uiContext);
+static int YomiBaseHan (uiContext);
 
 static
-YomiBaseHan(uiContext d)
+int YomiBaseHan(uiContext d)
 {
   (void)RomajiFlushYomi(d, d->genbuf, ROMEBUFSIZE);
   (void)EmptyBaseHan(d);
@@ -3829,10 +3831,10 @@ YomiBaseHan(uiContext d)
   return 0;
 }
 
-static YomiBaseKana (uiContext);
+static int YomiBaseKana (uiContext);
 
 static
-YomiBaseKana(uiContext d)
+int YomiBaseKana(uiContext d)
 {
   (void)RomajiFlushYomi(d, d->genbuf, ROMEBUFSIZE);
   (void)EmptyBaseKana(d);
@@ -3840,10 +3842,10 @@ YomiBaseKana(uiContext d)
   return 0;
 }
 
-static YomiBaseKakutei (uiContext);
+static int YomiBaseKakutei (uiContext);
 
 static
-YomiBaseKakutei(uiContext d)
+int YomiBaseKakutei(uiContext d)
 {
   (void)RomajiFlushYomi(d, d->genbuf, ROMEBUFSIZE);
   (void)EmptyBaseKakutei(d);
@@ -3851,10 +3853,10 @@ YomiBaseKakutei(uiContext d)
   return 0;
 }
 
-static YomiBaseHenkan (uiContext);
+static int YomiBaseHenkan (uiContext);
 
 static
-YomiBaseHenkan(uiContext d)
+int YomiBaseHenkan(uiContext d)
 {
   (void)RomajiFlushYomi(d, d->genbuf, ROMEBUFSIZE);
   (void)EmptyBaseHenkan(d);
@@ -3864,7 +3866,7 @@ YomiBaseHenkan(uiContext d)
 
 int YomiBaseHiraKataToggle (uiContext);
 
-YomiBaseHiraKataToggle(uiContext d)
+int YomiBaseHiraKataToggle(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -3882,7 +3884,7 @@ YomiBaseHiraKataToggle(uiContext d)
 
 int YomiBaseZenHanToggle (uiContext);
 
-YomiBaseZenHanToggle(uiContext d)
+int YomiBaseZenHanToggle(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -3900,7 +3902,7 @@ YomiBaseZenHanToggle(uiContext d)
 
 int YomiBaseRotateForw (uiContext);
 
-YomiBaseRotateForw(uiContext d)
+int YomiBaseRotateForw(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -3930,7 +3932,7 @@ YomiBaseRotateForw(uiContext d)
 
 int YomiBaseRotateBack (uiContext);
 
-YomiBaseRotateBack(uiContext d)
+int YomiBaseRotateBack(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -3959,7 +3961,7 @@ YomiBaseRotateBack(uiContext d)
 
 int YomiBaseKanaEisuToggle (uiContext);
 
-YomiBaseKanaEisuToggle(uiContext d)
+int YomiBaseKanaEisuToggle(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -3977,7 +3979,7 @@ YomiBaseKanaEisuToggle(uiContext d)
 
 int YomiBaseKakuteiHenkanToggle (uiContext);
 
-YomiBaseKakuteiHenkanToggle(uiContext d)
+int YomiBaseKakuteiHenkanToggle(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -3995,7 +3997,7 @@ YomiBaseKakuteiHenkanToggle(uiContext d)
 
 int YomiModeBackup (uiContext);
 
-YomiModeBackup(uiContext d)
+int YomiModeBackup(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -4038,7 +4040,7 @@ YomiModeBackup(uiContext d)
        ¤«¤ÊÊÑ´¹¤ò¹Ô¤¦¡£
  */
 
-exitJishu(uiContext d)
+int exitJishu(uiContext d)
 {
   yomiContext yc;
   int len, srclen, i, pos;
@@ -4078,18 +4080,18 @@ exitJishu(uiContext d)
   buf = d->genbuf;
   switch (jishu) {
   case JISHU_ZEN_KATA: /* Á´³Ñ¥«¥¿¥«¥Ê¤ËÊÑ´¹¤¹¤ë */
-    func1 = RkwCvtZen;
-    func2 = RkwCvtKana;
+    func1 = (int (*)(...))RkwCvtZen;
+    func2 = (int (*)(...))RkwCvtKana;
     goto jishuKakuteiKana;
 
   case JISHU_HAN_KATA: /* Ⱦ³Ñ¥«¥¿¥«¥Ê¤ËÊÑ´¹¤¹¤ë */
-    func1 = RkwCvtKana;
-    func2 = RkwCvtHan;
+    func1 = (int (*)(...))RkwCvtKana;
+    func2 = (int (*)(...))RkwCvtHan;
     goto jishuKakuteiKana;
 
   case JISHU_HIRA: /* ¤Ò¤é¤¬¤Ê¤ËÊÑ´¹¤¹¤ë */
-    func1 = RkwCvtZen;
-    func2 = RkwCvtHira;
+    func1 = (int (*)(...))RkwCvtZen;
+    func2 = (int (*)(...))RkwCvtHira;
 
   jishuKakuteiKana:
     /* ¤Þ¤º¡¢¥Ù¡¼¥¹¤¬¥í¡¼¥Þ»ú¤Î¤È¤­¤ËÆþÎϤµ¤ì¤¿¤â¤Î¤¬¤¢¤ì¤Ð¤«¤Ê¤ËÊÑ´¹¤¹¤ë */
@@ -4230,7 +4232,7 @@ exitJishu(uiContext d)
 }
 
 static
-YomiJishu(uiContext d, int fn)
+int YomiJishu(uiContext d, int fn)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -4716,58 +4718,58 @@ removeKana(uiContext d, yomiContext yc, int k, int r)
   yc->rStartp = yc->rCurs;
 }
 
-static YomiNextJishu (uiContext);
+static int YomiNextJishu (uiContext);
 
 static
-YomiNextJishu(uiContext d)
+int YomiNextJishu(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_Next);
 }
 
-static YomiPreviousJishu (uiContext);
+static int YomiPreviousJishu (uiContext);
 
 static
-YomiPreviousJishu(uiContext d)
+int YomiPreviousJishu(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_Prev);
 }
 
-static YomiKanaRotate (uiContext);
+static int YomiKanaRotate (uiContext);
 
 static
-YomiKanaRotate(uiContext d)
+int YomiKanaRotate(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_KanaRotate);
 }
 
-static YomiRomajiRotate (uiContext);
+static int YomiRomajiRotate (uiContext);
 
 static
-YomiRomajiRotate(uiContext d)
+int YomiRomajiRotate(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_RomajiRotate);
 }
 
-static YomiCaseRotateForward (uiContext);
+static int YomiCaseRotateForward (uiContext);
 
 static
-YomiCaseRotateForward(uiContext d)
+int YomiCaseRotateForward(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_CaseRotate);
 }
 
-static YomiZenkaku (uiContext);
+static int YomiZenkaku (uiContext);
 
 static
-YomiZenkaku(uiContext d)
+int YomiZenkaku(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_Zenkaku);
 }
 
-static YomiHankaku (uiContext);
+static int YomiHankaku (uiContext);
 
 static
-YomiHankaku(uiContext d)
+int YomiHankaku(uiContext d)
 {
   if (cannaconf.InhibitHankakuKana)
     return NothingChangedWithBeep(d);
@@ -4775,49 +4777,49 @@ YomiHankaku(uiContext d)
     return YomiJishu(d, CANNA_FN_Hankaku);
 }
 
-static YomiHiraganaJishu (uiContext);
+static int YomiHiraganaJishu (uiContext);
 
 static
-YomiHiraganaJishu(uiContext d)
+int YomiHiraganaJishu(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_Hiragana);
 }
 
-static YomiKatakanaJishu (uiContext);
+static int YomiKatakanaJishu (uiContext);
 
 static
-YomiKatakanaJishu(uiContext d)
+int YomiKatakanaJishu(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_Katakana);
 }
 
-static YomiRomajiJishu (uiContext);
+static int YomiRomajiJishu (uiContext);
 
 static
-YomiRomajiJishu(uiContext d)
+int YomiRomajiJishu(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_Romaji);
 }
 
-static YomiToLower (uiContext);
+static int YomiToLower (uiContext);
 static
-YomiToLower(uiContext d)
+int YomiToLower(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_ToLower);
 }
 
-static YomiToUpper (uiContext);
+static int YomiToUpper (uiContext);
 
 static
-YomiToUpper(uiContext d)
+int YomiToUpper(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_ToUpper);
 }
 
-static YomiCapitalize (uiContext);
+static int YomiCapitalize (uiContext);
 
 static
-YomiCapitalize(uiContext d)
+int YomiCapitalize(uiContext d)
 {
   return YomiJishu(d, CANNA_FN_Capitalize);
 }
diff --git a/src/add-ons/input_server/methods/canna/lib/t_reimap.h b/src/add-ons/input_server/methods/canna/lib/t_reimap.h
index 5477dae01a..ee94eaf257 100644
--- a/src/add-ons/input_server/methods/canna/lib/t_reimap.h
+++ b/src/add-ons/input_server/methods/canna/lib/t_reimap.h
@@ -22,7 +22,7 @@
 // Modified by T.Murai
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char t_reimap_id[] = "@(#) 102.1 $Id: t_reimap.h,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char t_reimap_id[] = "@(#) 102.1 $Id$";
 #endif	/* lint */
 
 #include "canna.h"
@@ -34,7 +34,7 @@ static struct funccfunc tourokureibun_funcs[] = {
   {0				,0		},
 };
 
-extern searchfunc(...);
+extern int searchfunc(...);
 KanjiModeRec tourokureibun_mode = {
   searchfunc,
   default_kmap,
diff --git a/src/add-ons/input_server/methods/canna/lib/tanmap.h b/src/add-ons/input_server/methods/canna/lib/tanmap.h
index ddea73614e..e8b7d3243c 100644
--- a/src/add-ons/input_server/methods/canna/lib/tanmap.h
+++ b/src/add-ons/input_server/methods/canna/lib/tanmap.h
@@ -22,7 +22,7 @@
 // Modified by T.Murai
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char tanmap_id[] = "@(#) 102.1 $Id: tanmap.h,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char tanmap_id[] = "@(#) 102.1 $Id$";
 #endif /* lint */
 
 #include "canna.h"
@@ -69,7 +69,7 @@ static struct funccfunc tan_funcs[] = {
   {0				,0			},
 };
 
-extern searchfunc(...);
+extern int searchfunc(...);
 KanjiModeRec tankouho_mode = {
   searchfunc,
   default_kmap,
diff --git a/src/add-ons/input_server/methods/canna/lib/uiutil.c b/src/add-ons/input_server/methods/canna/lib/uiutil.c
index 6f8697bbfb..0c87eb882e 100644
--- a/src/add-ons/input_server/methods/canna/lib/uiutil.c
+++ b/src/add-ons/input_server/methods/canna/lib/uiutil.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: uiutil.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif
 
 #include "canna.h"
@@ -171,10 +171,10 @@ static menustruct *me[N_BUILTIN_MENU];
 #define MBUFSIZE 512
 
 static menustruct *copystruct(struct _e_menu *eucmenu);
-static makeUiUtilEchoStr(uiContext d);
+static int makeUiUtilEchoStr(uiContext d);
 static void pushmenu(uiContext d, menustruct *tab);
-static uuflExitCatch(uiContext d, int retval, mode_context env);
-static uuflQuitCatch(uiContext d, int retval, mode_context env);
+static int uuflExitCatch(uiContext d, int retval, mode_context env);
+static int uuflQuitCatch(uiContext d, int retval, mode_context env);
 static menuinfo *newMenuInfo(menustruct *tab);
 static menuinfo *findMenuInfo(menuinfo *p, menustruct *ms);
 
@@ -311,7 +311,7 @@ finExtMenu(void)
 #endif /* NO_EXTEND_MENU */
 
 static
-makeUiUtilEchoStr(uiContext d)
+int makeUiUtilEchoStr(uiContext d)
 {
   ichiranContext ic = (ichiranContext)d->modec;
 
@@ -344,7 +344,7 @@ pushmenu(uiContext d, menustruct *tab)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuflExitCatch(uiContext d, int retval, mode_context env)
+int uuflExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   forichiranContext fc;
@@ -406,7 +406,7 @@ uuflExitCatch(uiContext d, int retval, mode_context env)
   return NothingChangedWithBeep(d); /* ¤³¤³¤Ë¤ÏÍè¤Ê¤¤¤Ï¤º */
 }
 
-prevMenuIfExist(uiContext d)
+int prevMenuIfExist(uiContext d)
 {
   menustruct *m = d->prevMenu;
 
@@ -422,7 +422,7 @@ prevMenuIfExist(uiContext d)
 }
 
 static
-uuflQuitCatch(uiContext d, int retval, mode_context env)
+int uuflQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* °ìÍ÷¤ò pop */
@@ -440,7 +440,7 @@ uuflQuitCatch(uiContext d, int retval, mode_context env)
   UiUtilMode -- UI¥æ¡¼¥Æ¥£¥ê¥Æ¥£¥â¡¼¥É¤Ë¤Ê¤ë¤È¤­¤Ë¸Æ¤Ð¤ì¤ë¡£
 
  */
-UiUtilMode(uiContext d)
+int UiUtilMode(uiContext d)
 {
 #ifdef NO_EXTEND_MENU
   d->kanji_status_return->info |= KanjiExtendInfo;
diff --git a/src/add-ons/input_server/methods/canna/lib/uldefine.c b/src/add-ons/input_server/methods/canna/lib/uldefine.c
index 22876e4310..0d85f9af67 100644
--- a/src/add-ons/input_server/methods/canna/lib/uldefine.c
+++ b/src/add-ons/input_server/methods/canna/lib/uldefine.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: uldefine.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif
 
 #include	<errno.h>
@@ -31,28 +31,28 @@ static char rcs_id[] = "@(#) 102.1 $Id: uldefine.c,v 1.1 2004/12/23 21:23:49 kor
 
 // static void clearTourokuContext(tourokuContext p);
 static tourokuContext newTourokuContext(void);
-static uuTTangoEveryTimeCatch(uiContext d, int retval, mode_context env);
-static uuTTangoExitCatch(uiContext d, int retval, mode_context env);
-static uuT2TangoEveryTimeCatch(uiContext d, int retval, mode_context env);
-static uuT2TangoExitCatch(uiContext d, int retval, mode_context nyc);
-static uuT2TangoQuitCatch(uiContext d, int retval, mode_context env);
-static uuTMakeDicYesCatch(uiContext d, int retval, mode_context env);
-static uuTMakeDicQuitCatch(uiContext d, int retval, mode_context env);
-static uuTMakeDicNoCatch(uiContext d, int retval, mode_context env);
-static dicTourokuDo(uiContext d);
+static int uuTTangoEveryTimeCatch(uiContext d, int retval, mode_context env);
+static int uuTTangoExitCatch(uiContext d, int retval, mode_context env);
+static int uuT2TangoEveryTimeCatch(uiContext d, int retval, mode_context env);
+static int uuT2TangoExitCatch(uiContext d, int retval, mode_context nyc);
+static int uuT2TangoQuitCatch(uiContext d, int retval, mode_context env);
+static int uuTMakeDicYesCatch(uiContext d, int retval, mode_context env);
+static int uuTMakeDicQuitCatch(uiContext d, int retval, mode_context env);
+static int uuTMakeDicNoCatch(uiContext d, int retval, mode_context env);
+static int dicTourokuDo(uiContext d);
 static struct dicname *findUsrDic(void);
-static checkUsrDic(uiContext d);
-static dicTourokuTangoPre(uiContext d);
-static acDicTourokuTangoPre(uiContext d, int dn, mode_context dm);
-static uuTYomiEveryTimeCatch(uiContext d, int retval, mode_context env);
-static uuTYomiExitCatch(uiContext d, int retval, mode_context env);
-static uuTYomiQuitCatch(uiContext d, int retval, mode_context env);
-static dicTourokuYomi(uiContext d);
-static acDicTourokuYomi(uiContext d, int dn, mode_context dm);
-static dicTourokuYomiDo(uiContext d, canna_callback_t quitfunc);
-static uuTHinshiExitCatch(uiContext d, int retval, mode_context env);
-static uuTHinshiQuitCatch(uiContext d, int retval, mode_context env);
-extern specialfunc (uiContext, int);
+static int checkUsrDic(uiContext d);
+static int dicTourokuTangoPre(uiContext d);
+static int acDicTourokuTangoPre(uiContext d, int dn, mode_context dm);
+static int uuTYomiEveryTimeCatch(uiContext d, int retval, mode_context env);
+static int uuTYomiExitCatch(uiContext d, int retval, mode_context env);
+static int uuTYomiQuitCatch(uiContext d, int retval, mode_context env);
+static int dicTourokuYomi(uiContext d);
+static int acDicTourokuYomi(uiContext d, int dn, mode_context dm);
+static int dicTourokuYomiDo(uiContext d, canna_callback_t quitfunc);
+static int uuTHinshiExitCatch(uiContext d, int retval, mode_context env);
+static int uuTHinshiQuitCatch(uiContext d, int retval, mode_context env);
+extern int specialfunc (uiContext, int);
 
 #if !defined(NO_EXTEND_MENU) && !defined(WIN)
 #ifdef luna88k
@@ -173,7 +173,7 @@ newTourokuContext(void)
   return tcxt;
 }
 
-getTourokuContext(uiContext d)
+int getTourokuContext(uiContext d)
 {
   tourokuContext tc;
   int retval = 0;
@@ -218,7 +218,7 @@ popTourokuMode(uiContext d)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuTTangoEveryTimeCatch(uiContext d, int retval, mode_context env)
+int uuTTangoEveryTimeCatch(uiContext d, int retval, mode_context env)
 {
   tourokuContext tc = (tourokuContext)env;
   int len, echoLen, revPos;
@@ -286,7 +286,7 @@ uuTTangoEveryTimeCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuTTangoExitCatch(uiContext d, int retval, mode_context env)
+int uuTTangoExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   tourokuContext tc;
@@ -302,7 +302,7 @@ uuTTangoExitCatch(uiContext d, int retval, mode_context env)
   return(dicTourokuYomi(d));
 }
 
-uuTTangoQuitCatch(uiContext d, int retval, mode_context env)
+int uuTTangoQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* Æɤߤò pop */
@@ -314,7 +314,7 @@ uuTTangoQuitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuT2TangoEveryTimeCatch(uiContext d, int retval, mode_context env)
+int uuT2TangoEveryTimeCatch(uiContext d, int retval, mode_context env)
 {
   yomiContext nyc;
   int echoLen, pos, offset;
@@ -372,7 +372,7 @@ uuT2TangoEveryTimeCatch(uiContext d, int retval, mode_context env)
  *  ñ¸ìÅÐÏ¿¥â¡¼¥É¤òÈ´¤±¤ëºÝ¤ËɬÍפʽèÍý¤ò¹Ô¤¦  *
  ************************************************/
 static
-uuT2TangoExitCatch(uiContext d, int retval, mode_context nyc)
+int uuT2TangoExitCatch(uiContext d, int retval, mode_context nyc)
 /* ARGSUSED */
 {
   yomiContext yc;
@@ -392,7 +392,7 @@ uuT2TangoExitCatch(uiContext d, int retval, mode_context nyc)
 }
 
 static
-uuT2TangoQuitCatch(uiContext d, int retval, mode_context env)
+int uuT2TangoQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* Æɤߤò pop */
@@ -409,13 +409,13 @@ uuT2TangoQuitCatch(uiContext d, int retval, mode_context env)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuTMakeDicYesCatch(uiContext d, int retval, mode_context env)
+int uuTMakeDicYesCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   int err = 0, perr = 0;
   tourokuContext tc;
   WCHAR_T **dp;
-  extern defaultContext;
+  extern int defaultContext;
 
   popCallback(d); /* yesNo ¤ò¥Ý¥Ã¥× */
 
@@ -475,7 +475,7 @@ uuTMakeDicYesCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuTMakeDicQuitCatch(uiContext d, int retval, mode_context env)
+int uuTMakeDicQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* yesNo ¤ò¥Ý¥Ã¥× */
@@ -486,7 +486,7 @@ uuTMakeDicQuitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuTMakeDicNoCatch(uiContext d, int retval, mode_context env)
+int uuTMakeDicNoCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* yesNo ¤ò¥Ý¥Ã¥× */
@@ -510,7 +510,7 @@ getUserDicName(uiContext d)
   int nmudic; /* ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤ë¥æ¡¼¥¶¼­½ñ¤Î¿ô */
   struct dicname *p;
   WCHAR_T **tourokup, **tp;
-  extern defaultContext;
+  extern int defaultContext;
 
   if(defaultContext < 0) {
     if((KanjiInit() < 0) || (defaultContext < 0)) {
@@ -553,7 +553,7 @@ getUserDicName(uiContext d)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 /* »Ï¤á¤Ë¸Æ¤Ð¤ì¤ë´Ø¿ô */
 
-dicTouroku(uiContext d)
+int dicTouroku(uiContext d)
 {
   tourokuContext tc;
   yomiContext yc = (yomiContext)d->modec;
@@ -580,7 +580,7 @@ dicTouroku(uiContext d)
 }
 
 static
-dicTourokuDo(uiContext d)
+int dicTourokuDo(uiContext d)
 {
   tourokuContext tc;
   WCHAR_T **up;
@@ -639,7 +639,7 @@ findUsrDic(void)
  *   ¥Þ¥¦¥ó¥È¤µ¤ì¤Æ¤¤¤ë¼­½ñ¤¬¤Ê¤¤
  */
 static
-checkUsrDic(uiContext d)
+int checkUsrDic(uiContext d)
 {
   tourokuContext tc = (tourokuContext)d->modec;
   coreContext ync;
@@ -693,7 +693,7 @@ checkUsrDic(uiContext d)
   return(0);
 }
 
-dicTourokuTango(uiContext d, canna_callback_t quitfunc)
+int dicTourokuTango(uiContext d, canna_callback_t quitfunc)
 {
   tourokuContext tc = (tourokuContext)d->modec;
   yomiContext yc, yc2;
@@ -737,13 +737,13 @@ dicTourokuTango(uiContext d, canna_callback_t quitfunc)
 }
 
 static
-dicTourokuTangoPre(uiContext d)
+int dicTourokuTangoPre(uiContext d)
 {
   return dicTourokuTango(d, uuTTangoQuitCatch);
 }
 
 static
-acDicTourokuTangoPre(uiContext d, int dn, mode_context dm)
+int acDicTourokuTangoPre(uiContext d, int dn, mode_context dm)
 /* ARGSUSED */
 {
   popCallback(d);
@@ -755,7 +755,7 @@ acDicTourokuTangoPre(uiContext d, int dn, mode_context dm)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuTYomiEveryTimeCatch(uiContext d, int retval, mode_context env)
+int uuTYomiEveryTimeCatch(uiContext d, int retval, mode_context env)
 {
   tourokuContext tc = (tourokuContext)env;
   int len, echoLen, revPos;
@@ -812,7 +812,7 @@ uuTYomiEveryTimeCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuTYomiExitCatch(uiContext d, int retval, mode_context env)
+int uuTYomiExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   tourokuContext tc;
@@ -828,10 +828,10 @@ uuTYomiExitCatch(uiContext d, int retval, mode_context env)
   return(dicTourokuHinshi(d));
 }
 
-static uuTYomiQuitCatch (uiContext, int, mode_context);
+static int uuTYomiQuitCatch (uiContext, int, mode_context);
 
 static
-uuTYomiQuitCatch(uiContext d, int retval, mode_context env)
+int uuTYomiQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* Æɤߤò pop */
@@ -843,13 +843,13 @@ uuTYomiQuitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-dicTourokuYomi(uiContext d)
+int dicTourokuYomi(uiContext d)
 {
   return(dicTourokuYomiDo(d, uuTYomiQuitCatch));
 }
 
 static
-acDicTourokuYomi(uiContext d, int dn, mode_context dm)
+int acDicTourokuYomi(uiContext d, int dn, mode_context dm)
 /* ARGSUSED */
 {
   popCallback(d);
@@ -857,7 +857,7 @@ acDicTourokuYomi(uiContext d, int dn, mode_context dm)
 }
 
 static
-dicTourokuYomiDo(uiContext d, canna_callback_t quitfunc)
+int dicTourokuYomiDo(uiContext d, canna_callback_t quitfunc)
 {
   yomiContext yc;
   tourokuContext tc = (tourokuContext)d->modec;
@@ -895,7 +895,7 @@ dicTourokuYomiDo(uiContext d, canna_callback_t quitfunc)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuTHinshiExitCatch(uiContext d, int retval, mode_context env)
+int uuTHinshiExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   forichiranContext fc;
@@ -929,7 +929,7 @@ uuTHinshiExitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuTHinshiQuitCatch(uiContext d, int retval, mode_context env)
+int uuTHinshiQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* °ìÍ÷¤ò pop */
@@ -947,7 +947,7 @@ uuTHinshiQuitCatch(uiContext d, int retval, mode_context env)
   return(dicTourokuYomi(d));
 }
 
-dicTourokuHinshi(uiContext d)
+int dicTourokuHinshi(uiContext d)
 {
   tourokuContext tc = (tourokuContext)d->modec;
   forichiranContext fc;
@@ -1023,7 +1023,7 @@ dicTourokuHinshi(uiContext d)
  * jrKanjiControl ÍÑ                                                         *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-dicTourokuControl(uiContext d, WCHAR_T *tango, canna_callback_t quitfunc)
+int dicTourokuControl(uiContext d, WCHAR_T *tango, canna_callback_t quitfunc)
 {
   tourokuContext tc;
 
diff --git a/src/add-ons/input_server/methods/canna/lib/uldelete.c b/src/add-ons/input_server/methods/canna/lib/uldelete.c
index f9977f96ec..966e85eedb 100644
--- a/src/add-ons/input_server/methods/canna/lib/uldelete.c
+++ b/src/add-ons/input_server/methods/canna/lib/uldelete.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: uldelete.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif
 
 
@@ -36,28 +36,28 @@ static char rcs_id[] = "@(#) 102.1 $Id: uldelete.c,v 1.1 2004/12/23 21:23:49 kor
 #include "RK.h"
 #include "RKintern.h"
 
-static uuSYomiEveryTimeCatch(uiContext d, int retval, mode_context env);
-static uuSYomiExitCatch(uiContext d, int retval, mode_context env);
-static uuSYomiQuitCatch(uiContext d, int retval, mode_context env);
-static dicSakujoYomi(uiContext d);
-static acDicSakujoYomi(uiContext d, int dn, mode_context dm);
-static acDicSakujoDictionary(uiContext d, int dn, mode_context dm);
+static int uuSYomiEveryTimeCatch(uiContext d, int retval, mode_context env);
+static int uuSYomiExitCatch(uiContext d, int retval, mode_context env);
+static int uuSYomiQuitCatch(uiContext d, int retval, mode_context env);
+static int dicSakujoYomi(uiContext d);
+static int acDicSakujoYomi(uiContext d, int dn, mode_context dm);
+static int acDicSakujoDictionary(uiContext d, int dn, mode_context dm);
 static WCHAR_T **getMountDicName(uiContext d, int *num_return);
 static void CloseDeleteContext(tourokuContext tc);
-static getEffectDic(tourokuContext tc);
-static uuSTangoExitCatch(uiContext d, int retval, mode_context env);
-static uuSTangoQuitCatch(uiContext d, int retval, mode_context env);
-static dicSakujoBgnBun(uiContext d, RkStat *st);
-static dicSakujoEndBun(uiContext d);
-static dicSakujoTango(uiContext d);
-static getDeleteDic(mountContext mc);
-static uuSDicExitCatch(uiContext d, int retval, mode_context env);
-static uuSDicQuitCatch(uiContext d, int retval, mode_context env);
-static dicSakujoDictionary(uiContext d);
-static uuSDeleteYesCatch(uiContext d, int retval, mode_context env);
-static uuSDeleteQuitCatch(uiContext d, int retval, mode_context env);
-static uuSDeleteNoCatch(uiContext d, int retval, mode_context env);
-static dicSakujoDo(uiContext d);
+static int getEffectDic(tourokuContext tc);
+static int uuSTangoExitCatch(uiContext d, int retval, mode_context env);
+static int uuSTangoQuitCatch(uiContext d, int retval, mode_context env);
+static int dicSakujoBgnBun(uiContext d, RkStat *st);
+static int dicSakujoEndBun(uiContext d);
+static int dicSakujoTango(uiContext d);
+static int getDeleteDic(mountContext mc);
+static int uuSDicExitCatch(uiContext d, int retval, mode_context env);
+static int uuSDicQuitCatch(uiContext d, int retval, mode_context env);
+static int dicSakujoDictionary(uiContext d);
+static int uuSDeleteYesCatch(uiContext d, int retval, mode_context env);
+static int uuSDeleteQuitCatch(uiContext d, int retval, mode_context env);
+static int uuSDeleteNoCatch(uiContext d, int retval, mode_context env);
+static int dicSakujoDo(uiContext d);
 
 extern int RkwGetServerVersion (int *, int *);
 extern int RkwChmodDic (int, char *, int);
@@ -115,7 +115,7 @@ freeAndPopTouroku(uiContext d)
  * ñ¸ìºï½ü¤ÎÆɤߤÎÆþÎÏ                                                      *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 static
-uuSYomiEveryTimeCatch(uiContext d, int retval, mode_context env)
+int uuSYomiEveryTimeCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   int len, echoLen, revPos;
@@ -159,7 +159,7 @@ uuSYomiEveryTimeCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuSYomiExitCatch(uiContext d, int retval, mode_context env)
+int uuSYomiExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   tourokuContext tc;
@@ -176,7 +176,7 @@ uuSYomiExitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuSYomiQuitCatch(uiContext d, int retval, mode_context env)
+int uuSYomiQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* Æɤߤò pop */
@@ -191,7 +191,7 @@ uuSYomiQuitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-dicSakujoYomi(uiContext d)
+int dicSakujoYomi(uiContext d)
 {
   yomiContext yc;
 
@@ -217,7 +217,7 @@ dicSakujoYomi(uiContext d)
 }
 
 static
-acDicSakujoYomi(uiContext d, int dn, mode_context dm)
+int acDicSakujoYomi(uiContext d, int dn, mode_context dm)
 /* ARGSUSED */
 {
   popCallback(d);
@@ -225,7 +225,7 @@ acDicSakujoYomi(uiContext d, int dn, mode_context dm)
 }
 
 static
-acDicSakujoDictionary(uiContext d, int dn, mode_context dm)
+int acDicSakujoDictionary(uiContext d, int dn, mode_context dm)
 /* ARGSUSED */
 {
   popCallback(d);
@@ -243,7 +243,7 @@ getMountDicName(uiContext d, int *num_return)
   int nmmdic, check, majv, minv;
   struct dicname *p;
   WCHAR_T **tourokup, **tp;
-  extern defaultContext;
+  extern int defaultContext;
 
   if (defaultContext < 0) {
     if ((KanjiInit() < 0) || (defaultContext < 0)) {
@@ -324,7 +324,7 @@ getMountDicName(uiContext d, int *num_return)
   return tourokup;
 }
 
-dicSakujo(uiContext d)
+int dicSakujo(uiContext d)
 {
   WCHAR_T **mp, **p;
   tourokuContext tc;
@@ -389,7 +389,7 @@ CloseDeleteContext(tourokuContext tc)
  * »ØÄꤵ¤ì¤¿Ã±¸ì¤¬ÅÐÏ¿¤µ¤ì¤Æ¤¤¤ë¼­½ñ¤ò¼è¤ê½Ð¤¹
  */
 static
-getEffectDic(tourokuContext tc)
+int getEffectDic(tourokuContext tc)
 {
   int workContext, currentkouho, nbunsetsu, nelem = tc->nudic;
   WCHAR_T **mdic, **cands, **work;
@@ -538,7 +538,7 @@ getEffectDic(tourokuContext tc)
 }
 
 static
-uuSTangoExitCatch(uiContext d, int retval, mode_context env)
+int uuSTangoExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   forichiranContext fc;
@@ -569,7 +569,7 @@ uuSTangoExitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuSTangoQuitCatch(uiContext d, int retval, mode_context env)
+int uuSTangoQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   forichiranContext fc;
@@ -590,7 +590,7 @@ uuSTangoQuitCatch(uiContext d, int retval, mode_context env)
  * Æɤߤò»ØÄꤵ¤ì¤¿¼­½ñ¤«¤éÊÑ´¹¤¹¤ë
  */
 static
-dicSakujoBgnBun(uiContext d, RkStat *st)
+int dicSakujoBgnBun(uiContext d, RkStat *st)
 {
   tourokuContext tc = (tourokuContext)d->modec;
   int nbunsetsu;
@@ -675,7 +675,7 @@ dicSakujoBgnBun(uiContext d, RkStat *st)
 }
 
 static
-dicSakujoEndBun(uiContext d)
+int dicSakujoEndBun(uiContext d)
 {
   tourokuContext tc = (tourokuContext)d->modec;
 
@@ -693,7 +693,7 @@ dicSakujoEndBun(uiContext d)
 }
 
 static
-dicSakujoTango(uiContext d)
+int dicSakujoTango(uiContext d)
 {
   tourokuContext tc = (tourokuContext)d->modec;
   forichiranContext fc;
@@ -802,7 +802,7 @@ dicSakujoTango(uiContext d)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-getDeleteDic(mountContext mc)
+int getDeleteDic(mountContext mc)
 {
   tourokuContext tc = (tourokuContext)mc->next;
   int i, num = 0;
@@ -838,7 +838,7 @@ getDeleteDic(mountContext mc)
 
 
 static
-uuSDicExitCatch(uiContext d, int retval, mode_context env)
+int uuSDicExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   mountContext mc;
@@ -875,7 +875,7 @@ uuSDicExitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuSDicQuitCatch(uiContext d, int retval, mode_context env)
+int uuSDicQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* °ìÍ÷¤ò pop */
@@ -888,7 +888,7 @@ uuSDicQuitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-dicSakujoDictionary(uiContext d)
+int dicSakujoDictionary(uiContext d)
 {
   tourokuContext tc = (tourokuContext)d->modec;
   mountContext mc;
@@ -966,8 +966,9 @@ dicSakujoDictionary(uiContext d)
             }
             if ((retval = selectOnOff(d, xxxx, &mc->curIkouho, upnelem,
 		            BANGOMAX, 0, mc->mountOldStatus,
-		            NO_CALLBACK, uuSDicExitCatch, 
-                            uuSDicQuitCatch, uiUtilIchiranTooSmall)) == NG) {
+		            (int(*)(...))NO_CALLBACK, (int(*)(...))uuSDicExitCatch, 
+                            (int(*)(...))uuSDicQuitCatch,
+							(int(*)(...))uiUtilIchiranTooSmall)) == NG) {
               popMountMode(d);
               popCallback(d);
               deleteEnd(d);
@@ -1022,14 +1023,14 @@ dicSakujoDictionary(uiContext d)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuSDeleteYesCatch(uiContext d, int retval, mode_context env)
+int uuSDeleteYesCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   tourokuContext tc;
   char dicname[1024];
   deldicinfo *dic;
   int bufcnt, l;
-  extern defaultContext;
+  extern int defaultContext;
 
   deleteEnd(d);
   popCallback(d); /* yesNo ¤ò¥Ý¥Ã¥× */
@@ -1122,7 +1123,7 @@ uuSDeleteYesCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuSDeleteQuitCatch(uiContext d, int retval, mode_context env)
+int uuSDeleteQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   tourokuContext tc = (tourokuContext)env;
@@ -1138,7 +1139,7 @@ uuSDeleteQuitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuSDeleteNoCatch(uiContext d, int retval, mode_context env)
+int uuSDeleteNoCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* yesNo ¤ò¥Ý¥Ã¥× */
@@ -1153,7 +1154,7 @@ uuSDeleteNoCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-dicSakujoDo(uiContext d)
+int dicSakujoDo(uiContext d)
 {
   tourokuContext tc = (tourokuContext)d->modec;
   int l;
diff --git a/src/add-ons/input_server/methods/canna/lib/ulhinshi.c b/src/add-ons/input_server/methods/canna/lib/ulhinshi.c
index ebfbb4bfe9..5f2ee3b091 100644
--- a/src/add-ons/input_server/methods/canna/lib/ulhinshi.c
+++ b/src/add-ons/input_server/methods/canna/lib/ulhinshi.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: ulhinshi.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif
 
 #include <errno.h>
@@ -43,20 +43,20 @@ static void WSprintf(WCHAR_T *to_buf, WCHAR_T *x1, WCHAR_T *x2, WCHAR_T *from_bu
 static void EWStrcpy(WCHAR_T *buf, char *xxxx);
 static int EWStrcmp(WCHAR_T *buf, char *xxxx);
 static int EWStrncmp(WCHAR_T *buf, char *xxxx, int len);
-static uuTHinshiYNQuitCatch(uiContext d, int retval, mode_context env);
-static uuTHinshi2YesCatch(uiContext d, int retval, mode_context env);
-static uuTHinshi2NoCatch(uiContext d, int retval, mode_context env);
-static uuTHinshi1YesCatch(uiContext d, int retval, mode_context env);
-static uuTHinshi1NoCatch(uiContext d, int retval, mode_context env);
-static uuTHinshiQYesCatch(uiContext d, int retval, mode_context env);
-static uuTHinshiQNoCatch(uiContext d, int retval, mode_context env);
+static int uuTHinshiYNQuitCatch(uiContext d, int retval, mode_context env);
+static int uuTHinshi2YesCatch(uiContext d, int retval, mode_context env);
+static int uuTHinshi2NoCatch(uiContext d, int retval, mode_context env);
+static int uuTHinshi1YesCatch(uiContext d, int retval, mode_context env);
+static int uuTHinshi1NoCatch(uiContext d, int retval, mode_context env);
+static int uuTHinshiQYesCatch(uiContext d, int retval, mode_context env);
+static int uuTHinshiQNoCatch(uiContext d, int retval, mode_context env);
 static int makeHinshi(uiContext d);
-static tourokuYes(uiContext d);
-static tourokuNo(uiContext d);
+static int tourokuYes(uiContext d);
+static int tourokuNo(uiContext d);
 static void makeDoushi(uiContext d);
-static uuTDicExitCatch(uiContext d, int retval, mode_context env);
-static uuTDicQuitCatch(uiContext d, int retval, mode_context env);
-static tangoTouroku(uiContext d);
+static int uuTDicExitCatch(uiContext d, int retval, mode_context env);
+static int uuTDicQuitCatch(uiContext d, int retval, mode_context env);
+static int tangoTouroku(uiContext d);
 
 static char *e_message[] = {
 //#ifndef WIN
@@ -275,7 +275,7 @@ initGyouTable(void)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuTHinshiYNQuitCatch(uiContext d, int retval, mode_context env)
+int uuTHinshiYNQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d);
@@ -288,7 +288,7 @@ uuTHinshiYNQuitCatch(uiContext d, int retval, mode_context env)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuTHinshi2YesCatch(uiContext d, int retval, mode_context env)
+int uuTHinshi2YesCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   tourokuContext tc;
@@ -302,14 +302,14 @@ uuTHinshi2YesCatch(uiContext d, int retval, mode_context env)
   if (!tc->qbuf[0]) {
     if (tc->hcode[0]) {
       /* Éʻ줬·è¤Þ¤Ã¤¿¤Î¤Ç¡¢ÅÐÏ¿¤¹¤ë¥æ¡¼¥¶¼­½ñ¤Î»ØÄê¤ò¹Ô¤¦ */
-      return(dicTourokuDictionary(d, uuTDicExitCatch, uuTDicQuitCatch));
+      return(dicTourokuDictionary(d, (int(*)(...))uuTDicExitCatch, (int(*)(...))uuTDicQuitCatch));
     }
   }
   return(retval);
 }
 
 static
-uuTHinshi2NoCatch(uiContext d, int retval, mode_context env)
+int uuTHinshi2NoCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   tourokuContext tc;
@@ -323,7 +323,7 @@ uuTHinshi2NoCatch(uiContext d, int retval, mode_context env)
   if (!tc->qbuf[0]) {
     if (tc->hcode[0]) {
       /* Éʻ줬·è¤Þ¤Ã¤¿¤Î¤Ç¡¢ÅÐÏ¿¤¹¤ë¥æ¡¼¥¶¼­½ñ¤Î»ØÄê¤ò¹Ô¤¦ */
-      return(dicTourokuDictionary(d, uuTDicExitCatch, uuTDicQuitCatch));
+      return(dicTourokuDictionary(d, (int(*)(...))uuTDicExitCatch, (int(*)(...))uuTDicQuitCatch));
     }
   }
 
@@ -335,7 +335,7 @@ uuTHinshi2NoCatch(uiContext d, int retval, mode_context env)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuTHinshi1YesCatch(uiContext d, int retval, mode_context env)
+int uuTHinshi1YesCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   tourokuContext tc;
@@ -361,14 +361,14 @@ uuTHinshi1YesCatch(uiContext d, int retval, mode_context env)
     ync->minorMode = CANNA_MODE_TourokuHinshiMode;
   } else if(tc->hcode[0]) {
     /* Éʻ줬·è¤Þ¤Ã¤¿¤Î¤Ç¡¢ÅÐÏ¿¤¹¤ë¥æ¡¼¥¶¼­½ñ¤Î»ØÄê¤ò¹Ô¤¦ */
-    return(dicTourokuDictionary(d, uuTDicExitCatch, uuTDicQuitCatch));
+    return(dicTourokuDictionary(d, (int(*)(...))uuTDicExitCatch, (int(*)(...))uuTDicQuitCatch));
   }
 
   return(retval);
 }
 
 static
-uuTHinshi1NoCatch(uiContext d, int retval, mode_context env)
+int uuTHinshi1NoCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   tourokuContext tc;
@@ -394,7 +394,7 @@ uuTHinshi1NoCatch(uiContext d, int retval, mode_context env)
     ync->minorMode = CANNA_MODE_TourokuHinshiMode;
   } else if(tc->hcode[0]) {
     /* Éʻ줬·è¤Þ¤Ã¤¿¤Î¤Ç¡¢ÅÐÏ¿¤¹¤ë¥æ¡¼¥¶¼­½ñ¤Î»ØÄê¤ò¹Ô¤¦ */
-    return(dicTourokuDictionary(d, uuTDicExitCatch, uuTDicQuitCatch));
+    return(dicTourokuDictionary(d, (int(*)(...))uuTDicExitCatch, (int(*)(...))uuTDicQuitCatch));
   }
 
   return(retval);
@@ -405,7 +405,7 @@ uuTHinshi1NoCatch(uiContext d, int retval, mode_context env)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuTHinshiQYesCatch(uiContext d, int retval, mode_context env)
+int uuTHinshiQYesCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   tourokuContext tc;
@@ -430,12 +430,12 @@ uuTHinshiQYesCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuTHinshiQNoCatch(uiContext d, int retval, mode_context env)
+int uuTHinshiQNoCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* yesNo ¤ò¥Ý¥Ã¥× */
 
-  return(dicTourokuDictionary(d, uuTDicExitCatch, uuTDicQuitCatch));
+  return(dicTourokuDictionary(d, (int(*)(...))uuTDicExitCatch, (int(*)(...))uuTDicQuitCatch));
 }
 
 /* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
@@ -444,7 +444,7 @@ uuTHinshiQNoCatch(uiContext d, int retval, mode_context env)
 
 static int makeHinshi();
 
-dicTourokuHinshiDelivery(uiContext d)
+int dicTourokuHinshiDelivery(uiContext d)
 {
   tourokuContext tc = (tourokuContext)d->modec;
   coreContext ync;
@@ -479,7 +479,7 @@ dicTourokuHinshiDelivery(uiContext d)
     return(retval);
   } else if(tc->hcode[0]) {
     /* Éʻ줬·è¤Þ¤Ã¤¿¤Î¤Ç¡¢ÅÐÏ¿¤¹¤ë¥æ¡¼¥¶¼­½ñ¤Î»ØÄê¤ò¹Ô¤¦ */
-    return(dicTourokuDictionary(d, uuTDicExitCatch, uuTDicQuitCatch));
+    return(dicTourokuDictionary(d, (int(*)(...))uuTDicExitCatch, (int(*)(...))uuTDicQuitCatch));
   }
   return 0;
 }
@@ -651,7 +651,7 @@ makeHinshi(uiContext d)
 }
 
 static
-tourokuYes(uiContext d)
+int tourokuYes(uiContext d)
 {
   tourokuContext tc = (tourokuContext)d->modec;
 
@@ -739,7 +739,7 @@ tourokuYes(uiContext d)
 }
 
 static
-tourokuNo(uiContext d)
+int tourokuNo(uiContext d)
 {
   tourokuContext tc = (tourokuContext)d->modec;
   int ylen;
@@ -878,7 +878,7 @@ makeDoushi(uiContext d)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuTDicExitCatch(uiContext d, int retval, mode_context env)
+int uuTDicExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   forichiranContext fc;
@@ -903,7 +903,7 @@ uuTDicExitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuTDicQuitCatch(uiContext d, int retval, mode_context env)
+int uuTDicQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* °ìÍ÷¤ò pop */
@@ -914,7 +914,7 @@ uuTDicQuitCatch(uiContext d, int retval, mode_context env)
   return(dicTourokuHinshi(d));
 }
 
-dicTourokuDictionary(uiContext d, int (*exitfunc )(...), int (*quitfunc )(...))
+int dicTourokuDictionary(uiContext d, int (*exitfunc )(...), int (*quitfunc )(...))
 {
   tourokuContext tc = (tourokuContext)d->modec;
   forichiranContext fc;
@@ -948,7 +948,7 @@ dicTourokuDictionary(uiContext d, int (*exitfunc )(...), int (*quitfunc )(...))
 
    if((retval = selectOne(d, fc->allkouho, &fc->curIkouho, upnelem,
 		 BANGOMAX, inhibit, 0, WITHOUT_LIST_CALLBACK,
-		 NO_CALLBACK, exitfunc, quitfunc, uiUtilIchiranTooSmall)) 
+		 NO_CALLBACK,(int(*)(_uiContext*, int, _coreContextRec*))exitfunc, (int(*)(_uiContext*, int, _coreContextRec*))quitfunc, uiUtilIchiranTooSmall)) 
                  == NG) {
     if(fc->allkouho)
       free(fc->allkouho);
@@ -979,7 +979,7 @@ dicTourokuDictionary(uiContext d, int (*exitfunc )(...), int (*quitfunc )(...))
  * ñ¸ìÅÐÏ¿¤ò¹Ô¤¦
  */
 static
-tangoTouroku(uiContext d)
+int tangoTouroku(uiContext d)
 {
   tourokuContext tc = (tourokuContext)d->modec;
   WCHAR_T ktmpbuf[256];
diff --git a/src/add-ons/input_server/methods/canna/lib/ulkigo.c b/src/add-ons/input_server/methods/canna/lib/ulkigo.c
index 1dabf89fb5..f3edb40c8c 100644
--- a/src/add-ons/input_server/methods/canna/lib/ulkigo.c
+++ b/src/add-ons/input_server/methods/canna/lib/ulkigo.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: ulkigo.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif
 
 #include	<errno.h>
@@ -87,12 +87,12 @@ char *sgreek_data[] =
 
 #define	UUGD_SZ	(sizeof(sgreek_data) / sizeof(char *))
 
-static uuKigoExitDo(uiContext d, int retval);
-static uuKigoRExitCatch(uiContext d, int retval, mode_context env);
-static uuKigoGExitCatch(uiContext d, int retval, mode_context env);
-static uuKigoKExitCatch(uiContext d, int retval, mode_context env);
-static uuKigoQuitCatch(uiContext d, int retval, mode_context env);
-static kigoZenpan(uiContext d);
+static int uuKigoExitDo(uiContext d, int retval);
+static int uuKigoRExitCatch(uiContext d, int retval, mode_context env);
+static int uuKigoGExitCatch(uiContext d, int retval, mode_context env);
+static int uuKigoKExitCatch(uiContext d, int retval, mode_context env);
+static int uuKigoQuitCatch(uiContext d, int retval, mode_context env);
+static int kigoZenpan(uiContext d);
 
 static WCHAR_T *russia_data[UURD_SZ];
 static WCHAR_T *greek_data[UUGD_SZ];
@@ -173,7 +173,7 @@ initUlKeisenTable(void)
 }
 
 static
-uuKigoExitDo(uiContext d, int retval)
+int uuKigoExitDo(uiContext d, int retval)
 {
   popForIchiranMode(d);
   popCallback(d);
@@ -186,7 +186,7 @@ uuKigoExitDo(uiContext d, int retval)
 }
 
 static
-uuKigoRExitCatch(uiContext d, int retval, mode_context env)
+int uuKigoRExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   forichiranContext fc;
@@ -200,7 +200,7 @@ uuKigoRExitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuKigoGExitCatch(uiContext d, int retval, mode_context env)
+int uuKigoGExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   forichiranContext fc;
@@ -214,7 +214,7 @@ uuKigoGExitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuKigoKExitCatch(uiContext d, int retval, mode_context env)
+int uuKigoKExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   forichiranContext fc;
@@ -227,7 +227,7 @@ uuKigoKExitCatch(uiContext d, int retval, mode_context env)
   return(uuKigoExitDo(d, retval));
 }
 
-uuKigoGeneralExitCatch(uiContext d, int retval, mode_context env)
+int uuKigoGeneralExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   forichiranContext fc;
@@ -243,7 +243,7 @@ uuKigoGeneralExitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuKigoQuitCatch(uiContext d, int retval, mode_context env)
+int uuKigoQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* °ìÍ÷¤ò pop */
@@ -255,7 +255,7 @@ uuKigoQuitCatch(uiContext d, int retval, mode_context env)
   return prevMenuIfExist(d);
 }
 
-uuKigoMake(uiContext d, WCHAR_T **allkouho, int size, char cur, char mode, int (*exitfunc )(...), int *posp)
+int uuKigoMake(uiContext d, WCHAR_T **allkouho, int size, char cur, char mode, int (*exitfunc )(...), int *posp)
 {
   forichiranContext fc;
   ichiranContext ic;
@@ -277,7 +277,7 @@ uuKigoMake(uiContext d, WCHAR_T **allkouho, int size, char cur, char mode, int (
 
   if((retval = selectOne(d, fc->allkouho, &fc->curIkouho, size,
 		 KIGOBANGOMAX, inhibit, 0, WITH_LIST_CALLBACK,
-		 NO_CALLBACK, exitfunc,
+		 NO_CALLBACK, (int (*)(_uiContext*, int, _coreContextRec*))exitfunc,
 		 uuKigoQuitCatch, uiUtilIchiranTooSmall)) == NG) {
     return(GLineNGReturnFI(d));
   }
@@ -325,7 +325,7 @@ kigoZenpan(uiContext d)
  * ¥í¥·¥¢Ê¸»ú¤ÎÆþÎÏ                                                          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-kigoRussia(uiContext d)
+int kigoRussia(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -337,7 +337,9 @@ kigoRussia(uiContext d)
   return 0;
 #else
   return(uuKigoMake(d, (WCHAR_T **)russia_data, UURD_SZ,
-           d->currussia, CANNA_MODE_RussianMode, uuKigoRExitCatch, (int *)0));
+           d->currussia,
+		   CANNA_MODE_RussianMode,
+		   (int(*)(...))uuKigoRExitCatch, (int *)0));
 #endif
 }
 
@@ -345,7 +347,7 @@ kigoRussia(uiContext d)
  * ¥®¥ê¥·¥ãʸ»ú¤ÎÆþÎÏ                                                        *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-kigoGreek(uiContext d)
+int kigoGreek(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -357,7 +359,7 @@ kigoGreek(uiContext d)
   return 0;
 #else
   return(uuKigoMake(d, (WCHAR_T **)greek_data, UUGD_SZ,
-           d->curgreek, CANNA_MODE_GreekMode, uuKigoGExitCatch, (int *)0));
+           d->curgreek, CANNA_MODE_GreekMode, (int(*)(...))uuKigoGExitCatch, (int *)0));
 #endif
 }
 
@@ -365,7 +367,7 @@ kigoGreek(uiContext d)
  * ·ÓÀþ¤ÎÆþÎÏ                                                                *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-kigoKeisen(uiContext d)
+int kigoKeisen(uiContext d)
 {
   yomiContext yc = (yomiContext)d->modec;
 
@@ -377,6 +379,6 @@ kigoKeisen(uiContext d)
   return 0;
 #else
   return(uuKigoMake(d, (WCHAR_T **)keisen_data, UUKD_SZ,
-           d->curkeisen, CANNA_MODE_LineMode, uuKigoKExitCatch, (int *)0));
+           d->curkeisen, CANNA_MODE_LineMode, (int(*)(...))uuKigoKExitCatch, (int *)0));
 #endif
 }
diff --git a/src/add-ons/input_server/methods/canna/lib/ulmount.c b/src/add-ons/input_server/methods/canna/lib/ulmount.c
index 1b2da34cdf..eebe060598 100644
--- a/src/add-ons/input_server/methods/canna/lib/ulmount.c
+++ b/src/add-ons/input_server/methods/canna/lib/ulmount.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: ulmount.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif
 
 #ifndef NO_EXTEND_MENU
@@ -38,9 +38,9 @@ static char rcs_id[] = "@(#) 102.1 $Id: ulmount.c,v 1.1 2004/12/23 21:23:49 korl
 static mountContext newMountContext(void);
 static void freeMountContext(mountContext mc);
 static struct dicname *findDic(char *s);
-static uuMountExitCatch(uiContext d, int retval, mode_context env);
-static uuMountQuitCatch(uiContext d, int retval, mode_context env);
-static getDicList(uiContext d);
+static int uuMountExitCatch(uiContext d, int retval, mode_context env);
+static int uuMountQuitCatch(uiContext d, int retval, mode_context env);
+static int getDicList(uiContext d);
 
 /* cfunc mountContext
  *
@@ -90,7 +90,7 @@ freeMountContext(mountContext mc)
 /*
  * ¸õÊä°ìÍ÷¹Ô¤òºî¤ë
  */
-getMountContext(uiContext d)
+int getMountContext(uiContext d)
 {
   mountContext mc;
   int retval = 0;
@@ -149,12 +149,12 @@ findDic(char *s)
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 static
-uuMountExitCatch(uiContext d, int retval, mode_context env)
+int uuMountExitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   mountContext mc;
   int i, nmount = 0;
-  extern defaultContext;
+  extern int defaultContext;
   struct dicname *dp;
 
   killmenu(d);
@@ -291,7 +291,7 @@ uuMountExitCatch(uiContext d, int retval, mode_context env)
 }
 
 static
-uuMountQuitCatch(uiContext d, int retval, mode_context env)
+int uuMountQuitCatch(uiContext d, int retval, mode_context env)
 /* ARGSUSED */
 {
   popCallback(d); /* OnOff ¤ò¥Ý¥Ã¥× */
@@ -320,7 +320,7 @@ uuMountQuitCatch(uiContext d, int retval, mode_context env)
  * ¨¦¨¡¨¡¨¡¨¡¨¡¨¡¨¡¨¡¨¡¨¥ ¨¦¨¡¨¡¨¡¨¥
  */
 static
-getDicList(uiContext d)
+int getDicList(uiContext d)
 {
   mountContext mc = (mountContext)d->modec;
   char *dicLbuf, dicMbuf[ROMEBUFSIZE];
@@ -328,7 +328,7 @@ getDicList(uiContext d)
   char *wptr, **Lp, **Mp;
   BYTE *sop, *snp, *soldp, *snewp;
   int dicLc, dicMc, i;
-  extern defaultContext;
+  extern int defaultContext;
 
   if((dicLbuf = (char *)malloc(ROMEBUFSIZE)) == (char *)NULL) {
 #ifndef WIN
@@ -484,7 +484,7 @@ getDicList(uiContext d)
   return(dicLc);
 }
 
-dicMount(uiContext d)
+int dicMount(uiContext d)
 {
   ichiranContext oc;
   mountContext mc;
@@ -535,8 +535,8 @@ dicMount(uiContext d)
   }
   if((retval = selectOnOff(d, xxxx, &mc->curIkouho, nelem,
 		 BANGOMAX, currentkouho, mc->mountOldStatus,
-		 NO_CALLBACK, uuMountExitCatch,
-		 uuMountQuitCatch, uiUtilIchiranTooSmall)) == NG) {
+		 (int(*)(...))NO_CALLBACK, (int(*)(...))uuMountExitCatch,
+		 (int(*)(...))uuMountQuitCatch, (int(*)(...))uiUtilIchiranTooSmall)) == NG) {
     popMountMode(d);
     popCallback(d);
     killmenu(d);
diff --git a/src/add-ons/input_server/methods/canna/lib/ulserver.c b/src/add-ons/input_server/methods/canna/lib/ulserver.c
index ced383fcc2..164b29ba11 100644
--- a/src/add-ons/input_server/methods/canna/lib/ulserver.c
+++ b/src/add-ons/input_server/methods/canna/lib/ulserver.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: ulserver.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif
 
 #ifndef NO_EXTEND_MENU
@@ -32,10 +32,10 @@ static char rcs_id[] = "@(#) 102.1 $Id: ulserver.c,v 1.1 2004/12/23 21:23:49 kor
 extern int errno;
 #endif
 
-static uuServerChangeEveryTimeCatch(uiContext d, int retval, mode_context env);
-static uuServerChangeExitCatch(uiContext d, int retval, mode_context env);
-static uuServerChangeQuitCatch(uiContext d, int retval, mode_context env);
-static serverChangeDo(uiContext d, int len);
+static int uuServerChangeEveryTimeCatch(uiContext d, int retval, mode_context env);
+static int uuServerChangeExitCatch(uiContext d, int retval, mode_context env);
+static int uuServerChangeQuitCatch(uiContext d, int retval, mode_context env);
+static int serverChangeDo(uiContext d, int len);
 
 static int serverChangeDo();
 
@@ -43,7 +43,7 @@ static int serverChangeDo();
  * ¥µ¡¼¥Ð¤ÎÀÚ¤êÎ¥¤·                                                          *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-serverFin(uiContext d)
+int serverFin(uiContext d)
 {
   int retval = 0;
   yomiContext yc = (yomiContext)d->modec;
@@ -146,12 +146,12 @@ uuServerChangeQuitCatch(uiContext d, int retval, mode_context env)
 extern exp(char *) RkwGetServerName();
 #endif /* STANDALONE */
 
-serverChange(uiContext d)
+int serverChange(uiContext d)
 {
   int retval = 0;
   WCHAR_T *w;
   extern KanjiModeRec yomi_mode;
-  extern defaultContext;
+  extern int defaultContext;
   yomiContext yc = (yomiContext)d->modec;
 
 #ifndef STANDALONE
diff --git a/src/add-ons/input_server/methods/canna/lib/util.c b/src/add-ons/input_server/methods/canna/lib/util.c
index 11989e0786..71d1f30949 100644
--- a/src/add-ons/input_server/methods/canna/lib/util.c
+++ b/src/add-ons/input_server/methods/canna/lib/util.c
@@ -82,7 +82,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "@(#) 102.1 $Id: util.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static char rcs_id[] = "@(#) 102.1 $Id$";
 #endif	/* lint */
 
 #include "canna.h"
@@ -102,7 +102,7 @@ static char rcs_id[] = "@(#) 102.1 $Id: util.c,v 1.1 2004/12/23 21:23:49 korli E
 #define MB_LEN_MAX 5 /* 5 ¤â¹Ô¤«¤Ê¤¤¤À¤í¤¦¤È¤Ï»×¤¦ */
 #endif
 
-static wait_anykey_func(uiContext d, KanjiMode mode, int whattodo, int key, int fnum);
+static int wait_anykey_func(uiContext d, KanjiMode mode, int whattodo, int key, int fnum);
 
 /* arraydef
 
@@ -159,7 +159,7 @@ echostrClear(uiContext d)
  */
 
 inline
-colwidth(WCHAR_T *s, int len)
+int colwidth(WCHAR_T *s, int len)
 {
   int ret = 0;
   WCHAR_T *es = s + len;
@@ -217,7 +217,7 @@ NothingChanged(uiContext d)
   return 0;
 }
 
-NothingForGLine(uiContext d)
+int NothingForGLine(uiContext d)
 {
   d->kanji_status_return->length = -1; /* ÊѤï¤é¤Ê¤¤¡£ */
   d->kanji_status_return->revPos 
@@ -504,7 +504,7 @@ extractYomiString(yomiContext yc, WCHAR_T *s, WCHAR_T *e, int b, WCHAR_T **sr, W
 }
 
 inline
-extractString(WCHAR_T *str, WCHAR_T *s, WCHAR_T *e)
+int extractString(WCHAR_T *str, WCHAR_T *s, WCHAR_T *e)
 {
   int len;
 
@@ -679,7 +679,7 @@ makeGLineMessageFromString(uiContext d, char *msg)
   makeGLineMessage(d, d->genbuf, len);
 }
 
-setWStrings(WCHAR_T **ws, char **s, int sz)
+int setWStrings(WCHAR_T **ws, char **s, int sz)
 {
   int f = sz;
 
@@ -815,14 +815,14 @@ showRomeStruct(unsigned int dpy, unsigned int win)
 
 extern char *jrKanjiError;
 
-NoMoreMemory(void)
+int NoMoreMemory(void)
 {
   jrKanjiError = "\245\341\245\342\245\352\244\254\311\324\302\255\244\267\244\306\244\244\244\336\244\271\241\243";
                 /* ¥á¥â¥ê¤¬ÉÔ­¤·¤Æ¤¤¤Þ¤¹¡£ */
   return NG;
 }
 
-GLineNGReturn(uiContext d)
+int GLineNGReturn(uiContext d)
 {
   int len;
   len = MBstowcs(d->genbuf, jrKanjiError, ROMEBUFSIZE);
@@ -832,7 +832,7 @@ GLineNGReturn(uiContext d)
   return(0);
 }
 
-GLineNGReturnFI(uiContext d)
+int GLineNGReturnFI(uiContext d)
 {
   popForIchiranMode(d);
   popCallback(d);
@@ -857,7 +857,7 @@ specialfunc(uiContext d, int fn)
 
 #ifndef NO_EXTEND_MENU
 
-GLineNGReturnTK(uiContext d)
+int GLineNGReturnTK(uiContext d)
 {
   extern void popTourokuMode (uiContext);
  
@@ -1295,7 +1295,7 @@ WStringClose(void)
   nwsmemories = 0;
 }
 
-WSfree(WCHAR_T *s)
+int WSfree(WCHAR_T *s)
 {
   int	i;
   WCHAR_T **t;
@@ -1394,7 +1394,7 @@ generalReplace(WCHAR_T *buf, BYTE *attr, int *startp, int *cursor, int *endp, in
     attr[begin] |= attrmask; */
 }
 
-WToupper(WCHAR_T w)
+int WToupper(WCHAR_T w)
 {
   if ('a' <= w && w <= 'z')
     return((WCHAR_T) (w - 'a' + 'A'));
@@ -1402,7 +1402,7 @@ WToupper(WCHAR_T w)
     return(w);
 }
 
-WTolower(WCHAR_T w)
+int WTolower(WCHAR_T w)
 {
   if ('A' <= w && w <= 'Z') {
     return (WCHAR_T)(w - 'A' + 'a');
@@ -1453,7 +1453,7 @@ key2wchar(int key, int *check)
 int
 confirmContext(uiContext d, yomiContext yc)
 {
-  extern defaultContext;
+  extern int defaultContext;
 
   if (yc->context < 0) {
     if (d->contextCache >= 0) {
@@ -1484,7 +1484,7 @@ confirmContext(uiContext d, yomiContext yc)
 int
 abandonContext(uiContext d, yomiContext yc)
 {
-  extern defaultContext;
+  extern int defaultContext;
 
   if (yc->context >= 0) {
     if (d->contextCache >= 0) {
@@ -1512,7 +1512,7 @@ makeRkError(uiContext d, char *str)
 /* °Ê²¼¥á¥Ã¥»¡¼¥¸¤ò gline ¤Ë½Ð¤¹¤¿¤á¤Î»ÅÁÈ¤ß */
 
 inline
-ProcAnyKey(uiContext d)
+int ProcAnyKey(uiContext d)
 {
   coreContext cc = (coreContext)d->modec;
 
@@ -1524,10 +1524,10 @@ ProcAnyKey(uiContext d)
   return 0;
 }
 
-static wait_anykey_func (uiContext, KanjiMode, int, int, int);
+static int wait_anykey_func (uiContext, KanjiMode, int, int, int);
 
 static
-wait_anykey_func(uiContext d, KanjiMode mode, int whattodo, int key, int fnum)
+int wait_anykey_func(uiContext d, KanjiMode mode, int whattodo, int key, int fnum)
 /* ARGSUSED */
 {
   switch (whattodo) {
@@ -1587,7 +1587,7 @@ cannaMessageMode(uiContext d, canna_callback_t cnt)
 
  */
 
-canna_alert(uiContext d, char *message, canna_callback_t cnt)
+int canna_alert(uiContext d, char *message, canna_callback_t cnt)
 {
   d->nbytes = 0;
 
@@ -1599,7 +1599,7 @@ canna_alert(uiContext d, char *message, canna_callback_t cnt)
 char *
 KanjiInitError(void)
 {
-  extern standalone;
+  extern int standalone;
 
   if (standalone) {
     return "\244\253\244\312\264\301\273\372\312\321\264\271\244\307\244\255\244\336\244\273\244\363";
diff --git a/src/add-ons/input_server/methods/canna/lib/yesno.c b/src/add-ons/input_server/methods/canna/lib/yesno.c
index f281dc9ab8..60b8cb6d01 100644
--- a/src/add-ons/input_server/methods/canna/lib/yesno.c
+++ b/src/add-ons/input_server/methods/canna/lib/yesno.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static	char	rcs_id[] = "@(#) 102.1 $Id: yesno.c,v 1.1 2004/12/23 21:23:49 korli Exp $";
+static	char	rcs_id[] = "@(#) 102.1 $Id$";
 #endif  /* lint */
 
 #include	<errno.h>
@@ -34,9 +34,9 @@ extern int errno;
 static coreContext newYesNoContext(void);
 static void freeYesNoContext(coreContext qc);
 static void popYesNoMode(uiContext d);
-static YesNoNop(uiContext d);
-static YesNo(uiContext d);
-static YesNoQuit(uiContext d);
+static int YesNoNop(uiContext d);
+static int YesNo(uiContext d);
+static int YesNoQuit(uiContext d);
 
 /* cfunc yesNoContext
  *
@@ -71,7 +71,7 @@ freeYesNoContext(coreContext qc)
 /*
  * ¸õÊä°ìÍ÷¹Ô¤òºî¤ë
  */
-getYesNoContext(uiContext d, canna_callback_t everyTimeCallback, canna_callback_t exitCallback, canna_callback_t quitCallback, canna_callback_t auxCallback)
+int getYesNoContext(uiContext d, canna_callback_t everyTimeCallback, canna_callback_t exitCallback, canna_callback_t quitCallback, canna_callback_t auxCallback)
 {
   extern KanjiModeRec tourokureibun_mode;
   coreContext qc;
@@ -135,7 +135,7 @@ YesNoNop(uiContext d)
 static int YesNo (uiContext);
 
 static
-YesNo(uiContext d)
+int YesNo(uiContext d)
 {
   if((d->ch == 'y') || (d->ch == 'Y')) {
     popYesNoMode(d);
@@ -154,7 +154,7 @@ YesNo(uiContext d)
 static int YesNoQuit (uiContext);
 
 static
-YesNoQuit(uiContext d)
+int YesNoQuit(uiContext d)
 {
   int retval = 0;
 
diff --git a/src/add-ons/input_server/methods/canna/rk/bun.c b/src/add-ons/input_server/methods/canna/rk/bun.c
index 7b150041f3..359647905e 100644
--- a/src/add-ons/input_server/methods/canna/rk/bun.c
+++ b/src/add-ons/input_server/methods/canna/rk/bun.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcsid[] = "$Id: bun.c,v 1.1 2004/12/23 21:23:50 korli Exp $";
+static char rcsid[] = "$Id$";
 #endif
 
 /* LINTLIBRARY */
@@ -920,7 +920,7 @@ getKanji(struct RkContext *cx, int cnum, WCHAR_T *dst, int maxdst)
   WCHAR_T		*yomi;
   int		i, ylen;
 
-  i = getIt(cx, cnum, addKanji, dst, maxdst - 1);
+  i = getIt(cx, cnum, (int(*)(...))addKanji, dst, maxdst - 1);
   if (i < 0) {
     yomi = cx->store->yomi + bun->nb_yoff;
     ylen = bun->nb_curlen;
@@ -1026,7 +1026,7 @@ RkwGetLex(int cx_num, RkLex *dst, int maxdst)
     RkSetErrno(RK_ERRNO_ECTXNO);
     return -1;
   }
-  i = getIt(cx, (int)bun->nb_curcand, addLex, (WCHAR_T *)dst, maxdst - 1);
+  i = getIt(cx, (int)bun->nb_curcand, (int(*)(...))addLex, (WCHAR_T *)dst, maxdst - 1);
   if (i < 0) {
     if (dst && 1 < maxdst) {
       dst[0].ylen = bun->nb_curlen;
@@ -1127,7 +1127,7 @@ RkwGetHinshi(int cx_num, WCHAR_T *dst, int maxdst)
     RkSetErrno(RK_ERRNO_ECTXNO);
     return(-1);
   }
-  i = getIt(cx, (int)bun->nb_curcand, addHinshi, dst, maxdst - 1);
+  i = getIt(cx, (int)bun->nb_curcand, (int(*)(...))addHinshi, dst, maxdst - 1);
   if (i < 0) {
     if (dst && 1 < maxdst) 
       dst[0] = (WCHAR_T)0;
@@ -1279,7 +1279,7 @@ RkwSync(int cx_num, char *dicname)
 }
 
 /*ARGSUSED*/
-RkwGetSimpleKanji(int cxnum, char *dicname, WCHAR_T *yomi, int maxyomi, WCHAR_T *kanjis, int maxkanjis, char *hinshis, int maxhinshis)
+int RkwGetSimpleKanji(int cxnum, char *dicname, WCHAR_T *yomi, int maxyomi, WCHAR_T *kanjis, int maxkanjis, char *hinshis, int maxhinshis)
 {
   return -1;
 }
diff --git a/src/add-ons/input_server/methods/canna/rk/dic.c b/src/add-ons/input_server/methods/canna/rk/dic.c
index 15fe52ab42..ddfd97556c 100644
--- a/src/add-ons/input_server/methods/canna/rk/dic.c
+++ b/src/add-ons/input_server/methods/canna/rk/dic.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcsid[]="@(#) 102.1 $Id: dic.c,v 1.1 2004/12/23 21:23:50 korli Exp $";
+static char rcsid[]="@(#) 102.1 $Id$";
 #endif
 /*LINTLIBRARY*/
 
@@ -309,7 +309,7 @@ RkwCreateDic(int cx_num, char *dicname, int mode)
   return ret;
 }
 
-copyFile(struct DM *src, struct DM *dst)
+int copyFile(struct DM *src, struct DM *dst)
 {
   struct DF	*srcF = src->dm_file;
   struct DD	*srcD = srcF->df_direct;
@@ -727,9 +727,9 @@ RkwCopyDic(int co, char *dir, char *from, char *to, int mode)
 
 		RkwSync(co, from); /* sometimes, this failes to an error */
 		ptemplate =
-		  (type == DF_FREQDIC) ? FREQ_TEMPLATE :
-		    (type == DF_TEMPDIC) ? USER_TEMPLATE :
-		      PERM_TEMPLATE;
+		  (type == DF_FREQDIC) ? (char*)FREQ_TEMPLATE :
+		    (type == DF_TEMPDIC) ? (char*)USER_TEMPLATE :
+		      (char*)PERM_TEMPLATE;
 
 		res = ACCES;
 		filename = _RkCreateUniquePath(userDDP[0], ptemplate);
@@ -885,7 +885,7 @@ popTdn(struct RkContext *cx)
   }
 }
 
-inline
+inline int
 GetLine(struct RkContext *cx, struct RkKxGram *gram, struct TD *tdp, WCHAR_T *line, int size)
 {
   struct TD	*vtd;
diff --git a/src/add-ons/input_server/methods/canna/rk/ngram.c b/src/add-ons/input_server/methods/canna/rk/ngram.c
index 3f1e403759..51f6f340ae 100644
--- a/src/add-ons/input_server/methods/canna/rk/ngram.c
+++ b/src/add-ons/input_server/methods/canna/rk/ngram.c
@@ -26,7 +26,7 @@
 
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcsid[]="$Id: ngram.c,v 1.1 2004/12/23 21:23:50 korli Exp $";
+static char rcsid[]="$Id$";
 #endif
 
 #include	<stdio.h>
@@ -42,7 +42,7 @@ static char rcsid[]="$Id: ngram.c,v 1.1 2004/12/23 21:23:50 korli Exp $";
 // There is Exported Symbols !!
 static char **gram_to_tab(struct RkKxGram *gram);
 static WCHAR_T *skip_space(WCHAR_T *src);
-static skip_until_space(WCHAR_T *src, WCHAR_T **next);
+static int skip_until_space(WCHAR_T *src, WCHAR_T **next);
 static int wstowrec(struct RkKxGram *gram, WCHAR_T *src, Wrec *dst, unsigned maxdst, unsigned *yomilen, unsigned *wlen, unsigned long *lucks);
 static Wrec *fil_wc2wrec_flag(Wrec *wrec, unsigned *wreclen, unsigned ncand, WCHAR_T *yomi, unsigned ylen, unsigned left);
 static struct TW *RkWcand2Wrec(Wrec *key, struct RkWcand *wc, int nc, unsigned long *lucks);
diff --git a/src/add-ons/input_server/methods/canna/rk/nword.c b/src/add-ons/input_server/methods/canna/rk/nword.c
index ee2550c50e..10addc2f5d 100644
--- a/src/add-ons/input_server/methods/canna/rk/nword.c
+++ b/src/add-ons/input_server/methods/canna/rk/nword.c
@@ -24,9 +24,10 @@
 /* THIS SOURCE CODE IS MODIFIED FOR TKO BY T.MURAI 1997
 /************************************************************************/
 
+#include <string.h>
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcsid[]="$Id: nword.c,v 1.1 2004/12/23 21:23:50 korli Exp $";
+static char rcsid[]="$Id$";
 #endif
 
 /* LINTLIBRARY */
diff --git a/src/add-ons/input_server/methods/canna/rk/permdic.c b/src/add-ons/input_server/methods/canna/rk/permdic.c
index 7616457852..a72383d2ad 100644
--- a/src/add-ons/input_server/methods/canna/rk/permdic.c
+++ b/src/add-ons/input_server/methods/canna/rk/permdic.c
@@ -21,7 +21,7 @@
  */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-static char rcs_id[] = "$Id: permdic.c,v 1.1 2004/12/23 21:23:50 korli Exp $";
+static char rcs_id[] = "$Id$";
 #endif
 
 #include	<unistd.h>
@@ -47,7 +47,7 @@ extern int fd_dic;      /* mmap */
 #endif
 
 static unsigned char *assurep(struct ND *dic, int id);
-static readThisCache(struct DM *dm, struct ND *xdm, long pgno, unsigned long val, WCHAR_T *key, int cur, int ylen, struct nread *nread, int mc, int nc, int *cf);
+static int readThisCache(struct DM *dm, struct ND *xdm, long pgno, unsigned long val, WCHAR_T *key, int cur, int ylen, struct nread *nread, int mc, int nc, int *cf);
 static int SearchInPage(struct DM *dm, struct ND *xdm, long pgno, unsigned char *buf, unsigned long val, WCHAR_T *key, int cur, int ylen, struct nread *nread, int mc, int nc, int *cf);
 static int SearchInDir(struct DM *dm, struct ND *xdm, unsigned char *pos, WCHAR_T *key, int cur, int ylen, struct nread *nread, int mc, int nc, int *cf);
 static void ch_perm(struct DM *qm, unsigned offset, int size, int num);
@@ -415,7 +415,7 @@ _RkEql(WCHAR_T *a, unsigned char *b, int n)
 }
 
 static
-readThisCache(struct DM *dm, struct ND *xdm, long pgno, unsigned long val, WCHAR_T *key, int cur, int ylen, struct nread *nread, int mc, int nc, int *cf)
+int readThisCache(struct DM *dm, struct ND *xdm, long pgno, unsigned long val, WCHAR_T *key, int cur, int ylen, struct nread *nread, int mc, int nc, int *cf)
 {
   int		remlen;
   unsigned char	*wrec1, *wrec;
diff --git a/src/add-ons/input_server/methods/canna/rk/tempdic.c b/src/add-ons/input_server/methods/canna/rk/tempdic.c
index 6d6a9c53ff..0ac09905cd 100644
--- a/src/add-ons/input_server/methods/canna/rk/tempdic.c
+++ b/src/add-ons/input_server/methods/canna/rk/tempdic.c
@@ -21,7 +21,7 @@
 */
 
 #if !defined(lint) && !defined(__CODECENTER__)
-	static char rcsid[]="$Id: tempdic.c,v 1.1 2004/12/23 21:23:50 korli Exp $";
+	static char rcsid[]="$Id$";
 #endif
 /*LINTLIBRARY*/
 
@@ -39,10 +39,10 @@
 static void freeTD(struct TD *td);
 static TD *newTD(void);
 static TN *extendTD(struct TD *tdic, WCHAR_T key, struct TW *tw);
-static yomi_equal(Wrec *x, Wrec *y, int n);
+static int yomi_equal(Wrec *x, Wrec *y, int n);
 static WCHAR_T nthKey(Wrec *w, int n);
 static TN *defineTD(struct DM *dm, struct TD *tab, int n, struct TW *newTW, int nlen);
-static enterTD(struct DM *dm, struct TD *td, struct RkKxGram *gram, WCHAR_T *word);
+static int enterTD(struct DM *dm, struct TD *td, struct RkKxGram *gram, WCHAR_T *word);
 static void shrinkTD(struct TD *td, WCHAR_T key);
 static int deleteTD(struct DM *dm, struct TD **tab, int n, Wrec *newW);
 
@@ -121,7 +121,7 @@ extendTD(struct TD *tdic, WCHAR_T key, struct TW *tw)
 }
 
 static
-yomi_equal(Wrec *x, Wrec *y, int n)
+int yomi_equal(Wrec *x, Wrec *y, int n)
 {
 	int l;
 	
@@ -216,7 +216,7 @@ defineTD(struct DM *dm, struct TD *tab, int n, struct TW *newTW, int nlen)
 }
 
 static
-enterTD(struct DM *dm, struct TD *td, struct RkKxGram *gram, WCHAR_T *word)
+int enterTD(struct DM *dm, struct TD *td, struct RkKxGram *gram, WCHAR_T *word)
 {
 	struct TW	tw;
 	int ret = -1;