File kinput2-v3.1-beta3.dif of Package kinput2

--- kinput2-v3.1-beta2.orig/lib/CcWnn.c	Fri Jul  6 10:32:50 2001
+++ kinput2-v3.1-beta2/lib/CcWnn.c	Thu Sep  6 17:20:33 2001
@@ -339,8 +339,8 @@
 
 static void ccInitialize();
 static void jcInitialize();
-static void createEnvError();
-static int createConfirm();
+static int createEnvError(const char *);
+static int createConfirm(const char *);
 
 static int funcDispatch();
 static void defAction();
@@ -897,9 +897,9 @@
     if (obj->ccWnn.pendingdata) restoreData(obj);
 }
 
-static void
+static int
 createEnvError(s)
-char *s;
+const char *s;
 {
     if (current_obj != NULL)
 	XtAppWarning(XtWidgetToApplicationContext((Widget)current_obj), s);
@@ -907,7 +907,7 @@
 
 static int
 createConfirm(s)
-char *s;
+const char *s;
 {
     if (current_obj != NULL && current_obj->ccWnn.confirmfunc != NULL)
 	return (*current_obj->ccWnn.confirmfunc)((Widget)current_obj, s);
--- kinput2-v3.1-beta2/lib/cconv.c
+++ kinput2-v3.1-beta2/lib/cconv.c	2001/05/12 13:50:23
@@ -604,6 +604,7 @@
 #endif
 
 #include	<stdio.h>
+#include	<stdlib.h>
 #include	<X11/Xlib.h>
 #include	<X11/keysym.h>
 #include	<X11/Xutil.h>
--- kinput2-v3.1-beta2/lib/ioecall.c
+++ kinput2-v3.1-beta2/lib/ioecall.c	2001/05/12 13:58:57
@@ -23,6 +23,7 @@
  */
 
 #include <stdio.h>
+#include <stdlib.h>
 #include <X11/Xlib.h>
 #include <X11/Xfuncproto.h>
 #include "IOECall.h"
--- kinput2-v3.1-beta2/lib/wnnlib.c
+++ kinput2-v3.1-beta2/lib/wnnlib.c	2001/05/12 13:51:24
@@ -575,6 +575,7 @@
 #endif
 #include	"wnnlib.h"
 #include	<string.h>
+#include	<stdlib.h>
 #include	<pwd.h>
 #include	<X11/Xos.h>
 
--- kinput2-v3.1-beta2/include/wnnlib.h	Fri Jul  6 10:32:49 2001
+++ kinput2-v3.1-beta2/include/wnnlib.h	Thu Sep  6 16:50:45 2001
@@ -107,11 +107,11 @@
 #ifdef __STDC__
 extern struct wnn_buf *jcOpen(char *server, char *envname,
 				int override, char *rcfile,
-				void (*error)(), int (*confirm)(),
+				int (*error)(const char *), int (*confirm)(const char *),
 				int timeout);
 extern struct wnn_buf *jcOpen2(char *server, char *envname,
 				int override, char *rcfile4, char *rcfile6,
-				void (*error)(), int (*confirm)(),
+				int (*error)(const char *), int (*confirm)(const char *),
 				int timeout);
 extern int jcClose(struct wnn_buf *wnn);
 extern int jcIsConnect(struct wnn_buf *wnn);
--- kinput2-v3.1-beta2/lib/wnnlib.c	Fri Jul  6 10:32:51 2001
+++ kinput2-v3.1-beta2/lib/wnnlib.c	Thu Sep  6 16:52:12 2001
@@ -277,7 +277,7 @@
  *
  * struct wnn_buf jcOpen(char *servername, char *envname,
  *			 char *rcfilename, int override,
- *			 void (*errmsgfunc)(), int (*confirmfunc)(),
+ *			 int (*errmsgfunc)(const char *), int (*confirmfunc)(const char *),
  *			 int timeout)
  *	jl_open ~~~~ jl_open_lang ~~~~~ wnnlib ~~~~~~~
  *	~~~~~~~~~~~~~ jl_open ~~~~ jl_open_lang ~~
@@ -1350,7 +1350,7 @@
 
 	/* ~~~~~~~~~~~~~ */
 	clp = buf->clauseInfo + cl;
-	len = jl_kanji_len(buf->wnn, cl);
+	len = jl_kanji_len(buf->wnn, cl,-1);
 	diff = len - ((clp + 1)->dispp - clp->dispp);
 	newlen = (buf->displayEnd - buf->displayBuf) + diff;
 	if (newlen > buf->bufferSize) {
@@ -3427,8 +3427,8 @@
 char *envname;
 int override;
 char *rcfile;
-void (*errmsg)();
-int (*confirm)();
+int (*errmsg)(const char *);
+int (*confirm)(const char *);
 int timeout;
 {
     return jcOpen2(server, envname, override, rcfile, rcfile, errmsg, confirm, timeout);
@@ -3441,8 +3441,8 @@
 int override;
 char *rcfile4;		/* wnnenvrc for Wnn4 */
 char *rcfile6;		/* wnnenvrc for Wnn6 */
-void (*errmsg)();
-int (*confirm)();
+int (*errmsg)(const char *);
+int (*confirm)(const char *);
 int timeout;
 {
     struct wnn_buf *wnnbuf;