Fix bugs

include/sj4core/sj_compat.h

@@ -1,31 +0,0 @@
-#ifndef __SJ4_COMPAT_H__
-#define __SJ4_COMPAT_H__
-
-#include <stddef.h>
-#include <stdarg.h>
-#include <stdio.h>
-
-#if defined(_MSC_VER)
-
-#if defined(_MSC_VER) && _MSC_VER < 1900
-static int __inline sj4_snprintf(char* buffer, size_t count, const char* fmt, ...) {
-	int	st;
-	va_list va;
-
-	va_start(va, fmt);
-	st = vsprintf(buffer, fmt, va);
-	va_end(va);
-
-	return st;
-}
-#else
-#define sj4_snprintf snprintf
-#endif
-
-#define sj4_strlcpy(x, y, z) strcpy((x), (y))
-#else
-#define sj4_snprintf snprintf
-#define sj4_strlcpy strlcpy
-#endif
-
-#endif

include/sj4core/sj_kanakan.h

@@ -76,7 +76,7 @@ int codesize(u_char);
 extern u_char chrtbl[256];
 
 /* cl2knj.c */
-int cl2knj(SJ4_CONTEXT u_char*, int, u_char*);
+int cl2knj(SJ4_CONTEXT u_char*, int, u_char*, int);
 int nextcl(SJ4_CONTEXT u_char*, int);
 int prevcl(SJ4_CONTEXT u_char*, int);
 int selectnum(SJ4_CONTEXT2);

include/sj4core/sj_rename.h

@@ -432,6 +432,6 @@
 
 #define termtbl Jtermtbl
 
-#include <sj_compat.h>
+#include <sj4compat.h>
 
 #endif

include/sj4core/sj_typedef.h

@@ -49,16 +49,11 @@ typedef void (*VFunc)(
     void*,
 #endif
     void*, void*, void*);
-typedef u_char* (*UCPFunc)(
-#ifndef SJ4_GLOBAL
-    void*,
-#endif
-    u_char*, u_char*, int);
 typedef int (*IFunc)(
 #ifndef SJ4_GLOBAL
     void*,
 #endif
-    void*, int);
+    void*, short);
 
 typedef int (*IFuncDict)(
 #ifndef SJ4_GLOBAL