# HG changeset patch
# User Yoshiki Yazawa <yaz@cc.rim.or.jp>
# Date 1204462199 -32400
# Node ID 709a803fbbff834541385cb8b7d9b6ba313cb40c
# Parent  778894f4449fc4dfce24f80e0d7fb0f42b4a4933
fixed prototype erratas

diff -r 778894f4449f -r 709a803fbbff Wnn/include/jllib.h
--- a/Wnn/include/jllib.h	Sun Mar 02 19:47:09 2008 +0900
+++ b/Wnn/include/jllib.h	Sun Mar 02 21:49:59 2008 +0900
@@ -249,14 +249,14 @@
 
 
 /* prototypes */
-struct wnn_buf *jl_open_lang(char *env_n, char *server_n, char *lang, char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void), int timeout);
-struct wnn_env *jl_connect_lang(register char *env_n, register char *server_n, register char *lang, register char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void), int timeout);
+struct wnn_buf *jl_open_lang(char *env_n, char *server_n, char *lang, char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *), int timeout);
+struct wnn_env *jl_connect_lang(register char *env_n, register char *server_n, register char *lang, register char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *), int timeout);
 struct wnn_env *jl_env_get(register struct wnn_buf *buf);
 struct wnn_jdata *jl_word_info_e(register struct wnn_env *env, int dic_no, int entry);
 w_char *jl_hinsi_name_e (register struct wnn_env *env, register int no);
 
 void jl_close(register struct wnn_buf *buf);
-int jl_dic_add_e(register struct wnn_env *env, char *dic_name, char *hindo_name, int rev, int prio, int rw, int hrw, char *pwd_dic, char *pwd_hindo, int (*error_handler)(void), int (*message_handler)(void));
+int jl_dic_add_e(register struct wnn_env *env, char *dic_name, char *hindo_name, int rev, int prio, int rw, int hrw, char *pwd_dic, char *pwd_hindo, int (*error_handler)(char *), int (*message_handler)(char *));
 int jl_dic_delete_e(register struct wnn_env *env, register int dic_no);
 int jl_dic_list_e (struct wnn_env *env, WNN_DIC_INFO **dicinfo);
 int jl_dic_save_all_e(struct wnn_env *env);
@@ -279,8 +279,8 @@
 int jl_param_get_e(struct wnn_env *env, struct wnn_param *para);
 int jl_param_set_e(register struct wnn_env *env, struct wnn_param *para);
 int jl_ren_conv (register struct wnn_buf *buf, register w_char *yomi, int bun_no, int bun_no2, int use_maep);
-int jl_set_env_wnnrc(register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void));
-int jl_set_env_wnnrc1(register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void), int level);
+int jl_set_env_wnnrc(register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *));
+int jl_set_env_wnnrc1(register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *), int level);
 int jl_set_jikouho(register struct wnn_buf *buf, register int offset);
 int jl_set_jikouho_dai(register struct wnn_buf *buf, int offset);
 int jl_tan_conv (register struct wnn_buf *buf, w_char *yomi, register int bun_no, register int bun_no2, int use_maep, int ich_shop);
diff -r 778894f4449f -r 709a803fbbff Wnn/jlib/jl.c
--- a/Wnn/jlib/jl.c	Sun Mar 02 19:47:09 2008 +0900
+++ b/Wnn/jlib/jl.c	Sun Mar 02 21:49:59 2008 +0900
@@ -424,7 +424,7 @@
  */
 
 struct wnn_env *
-jl_connect_lang (register char *env_n, register char *server_n, register char *lang, register char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void), int timeout)
+jl_connect_lang (register char *env_n, register char *server_n, register char *lang, register char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *), int timeout)
 {
   register WNN_JSERVER_ID *js = NULL;
   struct wnn_env *env;
@@ -559,7 +559,7 @@
 
 
 struct wnn_buf *
-jl_open_lang (char *env_n, char *server_n, char *lang, char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void), int timeout)
+jl_open_lang (char *env_n, char *server_n, char *lang, char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *), int timeout)
 {
   register int k, dmy;
   register struct wnn_buf *buf;
@@ -1436,7 +1436,7 @@
 
 /*********************************/
 int 
-jl_dic_add_e (register struct wnn_env *env, char *dic_name, char *hindo_name, int rev, int prio, int rw, int hrw, char *pwd_dic, char *pwd_hindo, int (*error_handler)(void), int (*message_handler)(void))
+jl_dic_add_e (register struct wnn_env *env, char *dic_name, char *hindo_name, int rev, int prio, int rw, int hrw, char *pwd_dic, char *pwd_hindo, int (*error_handler)(char *), int (*message_handler)(char *))
 {
   char tmp[256];
   char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN];
@@ -1611,7 +1611,7 @@
 }
 
 static int 
-create_pwd_file (register struct wnn_env *env, char *pwd_file, int (*error_handler)(void), int (*message_handler)(void))
+create_pwd_file (register struct wnn_env *env, char *pwd_file, int (*error_handler)(char *), int (*message_handler)(char *))
 {
   FILE *fp;
   char gomi[256];
@@ -2510,7 +2510,7 @@
 
 
 static int 
-sort_func_ws (register char *a, register char *b)
+sort_func_ws (const void *a, const void *b)
 {
   int ah, bh, ai, bi, iah, ibh, iai, ibi;
   ah = ((struct wnn_jdata *) a)->hindo;
@@ -2630,7 +2630,7 @@
 
 /** wnnrc を見てのパラメータの設定 */
 int 
-jl_set_env_wnnrc (register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void))
+jl_set_env_wnnrc (register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *))
 {
   int level = 0;
   int x;
@@ -2653,7 +2653,7 @@
 }
 
 int 
-jl_set_env_wnnrc1 (register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(void), int (*message_handler)(void), int level)
+jl_set_env_wnnrc1 (register struct wnn_env *env, char *wnnrc_n, int (*error_handler)(char *), int (*message_handler)(char *), int level)
 {
   register int num;
   char s[20][EXPAND_PATH_LENGTH];
@@ -2994,7 +2994,7 @@
 }
 
 static int 
-create_file (register struct wnn_env *env, char *n, int d, int fid, char *pwd_dic, char *pwd_hindo, int (*error_handler)(void), int (*message_handler)(void))
+create_file (register struct wnn_env *env, char *n, int d, int fid, char *pwd_dic, char *pwd_hindo, int (*error_handler)(char *), int (*message_handler)(char *))
 {
   char pwd[WNN_PASSWD_LEN], hpwd[WNN_PASSWD_LEN];
   int rev_dict_type;
@@ -3099,7 +3099,7 @@
 }
 
 static int 
-make_dir_rec1 (struct wnn_env *env, register char *path, int (*error_handler)(void), int (*message_handler)(void))
+make_dir_rec1 (struct wnn_env *env, register char *path, int (*error_handler)(char *), int (*message_handler)(char *))
 {
   char gomi[128];
   register char *c;
@@ -3119,7 +3119,7 @@
 }
 
 static int 
-make_dir1 (register struct wnn_env *env, register char *dirname, int (*error_handler)(void), int (*message_handler)(void))
+make_dir1 (register struct wnn_env *env, register char *dirname, int (*error_handler)(char *), int (*message_handler)(char *))
 {
   char gomi[128];
   if (dirname[0] == C_LOCAL)
@@ -3176,7 +3176,7 @@
 
 
 static int 
-call_error_handler (int (*error_handler)(void), char *c)
+call_error_handler (int (*error_handler)(char *), char *c)
 {
   register int x;
   x = error_handler (c);
@@ -3191,7 +3191,7 @@
 }
 
 static void 
-message_out (int (*message_handler)(void), char *format, int s1, int s2, int s3, int s4, int s5, int s6, int s7, int s8)
+message_out (int (*message_handler)(char *), char *format, int s1, int s2, int s3, int s4, int s5, int s6, int s7, int s8)
 {
   char buf[256];
 
@@ -3420,7 +3420,7 @@
 
 
 int
-jl_word_comment_set_e (register struct wnn_env *env, int dic_no, int entry, wchar *comment)
+jl_word_comment_set_e (register struct wnn_env *env, int dic_no, int entry, w_char *comment)
 {
   register int x;
   wnn_errorno = 0;