Cleanup

include/sj3core/Makefile.am

@@ -1,21 +0,0 @@
-EXTRA_DIST = \
-	Dict.h \
-	Struct.h \
-	sj3lowlib.h \
-	sj_connect.h \
-	sj_const.h \
-	sj_dict.h \
-	sj_global.h \
-	sj_kanakan.h \
-	sj_kcnv.h \
-	sj_left.h \
-	sj_prty.h \
-	sj_rename.h \
-	sj_right.h \
-	sj_struct.h \
-	sj_study.h \
-	sj_suuji.h \
-	sj_table.h \
-	sj_typedef.h \
-	sj_var.h \
-	sj_yomi.h

include/sj3core/Struct.h

@@ -117,7 +117,9 @@ typedef struct global {
 typedef	struct	dictfile {
 	DICT		dict;
 	int		refcnt;
+#ifdef SJ3_LOCK
 	fd_set		lock;
+#endif
 	FILE		*fp;
 	int		fd;
 
@@ -153,21 +155,4 @@ typedef	struct workarea {
 	Global		global;
 } WorkArea;
 
-typedef	struct client {
-	int		fd;
-	char		host[MAXHOSTNAMELEN];
-	char		user[MAXLOGNAME];
-	char		prog[FILENAME_MAX];
-
-	WorkArea	*work;
-	StdyFile	*stdy;
-	short           version;
-	unsigned char   def_char[2];
-#if (defined(TLI) && defined(SOCK_UNIX))
-	int             unix_flag;
-#endif
-	uid_t           uid;
-	struct client   *next;
-} Client;
-
 #endif

include/sj3core/sj_kanakan.h

@@ -17,6 +17,17 @@
 #ifndef KANAKAN_H
 #define KANAKAN_H
 
+#include <string.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <errno.h>
+#include <sys/stat.h>
+#ifdef _WIN32
+#include <io.h>
+#else
+#include <unistd.h>
+#endif
+
 #include "sj_kcnv.h"
 #include "sj_struct.h"
 

include/sj3core/sj_kcnv.h

@@ -34,7 +34,6 @@
  */
 
 #include <stdio.h>
-#include <sys/param.h>
 #include "sj_typedef.h"
 #include "sj_rename.h"
 #include "sj_const.h"

include/sj3core/sj_rename.h

@@ -38,8 +38,6 @@
 
 #define	_SJ_RENAME
 
-#include <config.h>
-
 #define	adddic		Jadddic
 #define	checksub	Jchecksub
 #define	checkdict	Jcheckdict

include/sj3core/sj_typedef.h

@@ -43,13 +43,15 @@
 
 #define	RECURS
 
+typedef unsigned char u_char;
+typedef unsigned short u_short;
+typedef unsigned int u_int;
+
 
 typedef	void	(*VFunc)();
 typedef	u_char	*(*UCPFunc)();
 typedef	int	(*IFunc)();
 
-#include <sys/types.h>
-
 typedef	u_char	TypeGroup;
 typedef	u_char	TypeGram;
 typedef	u_short	TypeIdxOfs;