--- FreeWnn-1.1.1-a017/Xsi/Wnn/etc/pwd.c.xx 2005-06-15 15:42:17.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/etc/pwd.c 2005-06-15 15:42:22.000000000 +0200 @@ -34,6 +34,7 @@ */ #ifndef JS #include +#include #include "commonhd.h" #include "jslib.h" #include "wnn_os.h" --- FreeWnn-1.1.1-a017/Xsi/Wnn/etc/msg.c.xx 2005-06-15 15:42:31.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/etc/msg.c 2005-06-15 15:50:20.000000000 +0200 @@ -48,71 +48,11 @@ */ #include +#include #include "commonhd.h" #include "wnn_os.h" #include "msg.h" -extern char *getenv (); - -#ifdef hpux -void * -bsearch (ky, bs, nel, width, compar) - const void *ky; - const void *bs; - size_t nel; - size_t width; - int (*compar) (const void *, const void *); -#else -static char * -bsearch (ky, bs, nel, width, compar) - char *ky; - char *bs; - unsigned long nel; - unsigned long width; - int (*compar) (); -#endif /* hpux */ -{ - char *key = ky; - char *base = bs; - int two_width = width + width; - char *last = base + width * (nel - 1); - - register char *p; - register int ret; -#ifdef hpux - register int tmp; -#endif - - while (last >= base) - { - p = base + width * ((last - base) / two_width); - ret = (*compar) ((void *) key, (void *) p); - - if (ret == 0) - return ((char *) p); /* found */ -#ifdef hpux - if (ret < 0) - { - tmp = p; - tmp -= width; - last = tmp; - } - else - { - tmp = p; - tmp += width; - base = tmp; - } -#else /* hpux */ - if (ret < 0) - last = p - width; - else - base = p + width; -#endif /* hpux */ - } - return ((char *) 0); /* not found */ -} - static char * getlang (lang) char *lang; --- FreeWnn-1.1.1-a017/Xsi/Wnn/etc/xutoj.c.xx 2005-06-15 15:58:39.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/etc/xutoj.c 2005-06-15 15:58:46.000000000 +0200 @@ -31,6 +31,7 @@ #define NEED_CR +#include #include "commonhd.h" #include "wnn_config.h" #include "wnn_os.h" --- FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/getopt.c.xx 2005-06-15 15:41:17.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/getopt.c 2005-06-15 15:49:17.000000000 +0200 @@ -29,6 +29,10 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ +#include +#include +#include + /*LINTLIBRARY*/ /*********************************************************************** getopt.c @@ -40,8 +44,6 @@ 加えて下さい。 ***********************************************************************/ -#define NULL 0 -#define EOF (-1) #define ERR_PRINT(s, c) \ if(opterr){ \ char errbuf[2]; \ @@ -55,8 +57,6 @@ #ifdef BSD42 #define strchr index #endif -extern int strcmp (); -extern char *strchr (); int opterr = 1; int optind = 1; --- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/Makefile.in.xx 2005-06-15 15:52:36.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/Makefile.in 2005-06-15 15:52:48.000000000 +0200 @@ -46,8 +46,8 @@ OBJ0= de.o OBJ1= de_vars.o dispatch.o do_dic_env.o do_dic_no.o do_filecom.o error.o jbiki.o jbiki_b.o jishoop.o jserver_id.o rd_jishoop.o readfile.o b_index.o jishosub.o jmt0.o malloc.o kai_area.o mknode0.o mknode1.o mknode2.o renbn_kai.o bnsetu_kai.o daibn_kai.o jikouho.o jikouho_d.o fzk.o atojis.o get_kaiarea.o snd_rcv.o do_henkan.o do_henkan1.o do_env.o do_hindo_s.o initjserv.o hinsi_list.o sisheng.o w_string.o -SRC2= $(WNNJLIBSRC)/getopt.c -OBJ2= getopt.o +SRC2= +OBJ2= SRC3= $(WNNJLIBSRC)/wnnerrmsg.c OBJ3= wnnerrmsg.o --- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c.xx 2005-06-15 15:38:43.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/de.c 2005-06-15 15:56:03.000000000 +0200 @@ -320,6 +320,7 @@ demon_main (); demon_fin (); + return 0; } static void --- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c.xx 2005-06-15 15:38:43.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/error.c 2005-06-15 15:39:45.000000000 +0200 @@ -35,6 +35,8 @@ #include #include #include +#include +#include #include "commonhd.h" #include "de_header.h" #include --- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/initjserv.c.xx 2005-06-15 15:38:43.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/initjserv.c 2005-06-15 15:40:51.000000000 +0200 @@ -32,6 +32,7 @@ #include #include +#include #include #if defined(HAVE_SYS_TYPES_H) --- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/jikouho.c.xx 2005-06-15 15:38:43.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/jikouho.c 2005-06-15 15:40:30.000000000 +0200 @@ -34,6 +34,7 @@ ************************************************/ #include #include +#include #include "commonhd.h" #include "de_header.h" #include "jdata.h" --- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/jikouho_d.c.xx 2005-06-15 15:38:43.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/jikouho_d.c 2005-06-15 15:56:33.000000000 +0200 @@ -34,6 +34,7 @@ ************************************************/ #include #include +#include #include "commonhd.h" #include "de_header.h" #include "jdata.h" --- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/malloc.c.xx 2005-06-15 15:38:43.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/malloc.c 2005-06-15 15:47:12.000000000 +0200 @@ -48,10 +46,6 @@ extern void *realloc (void *, size_t); extern void *calloc (size_t, size_t); #else -extern char *malloc (); -extern void free (); -extern char *realloc (); -extern char *calloc (); #endif /* hpux */ #ifdef hpux --- FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/wnnstat.c.xx 2005-06-15 15:57:00.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jutil/wnnstat.c 2005-06-15 15:58:06.000000000 +0200 @@ -34,6 +34,7 @@ #endif /* lint */ #include +#include #include "jslib.h" #include "jllib.h" #include "jd_sock.h" --- FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jikouho.c.xx 2005-06-15 15:59:10.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jikouho.c 2005-06-15 16:01:08.000000000 +0200 @@ -30,6 +30,7 @@ */ #include +#include #include "jllib.h" #include "commonhd.h" #include "sdefine.h" --- FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jutil.c.xx 2005-06-15 15:59:10.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/uum/jutil.c 2005-06-15 16:01:19.000000000 +0200 @@ -33,6 +33,7 @@ /* 活辞書とはカレントユーザ辞書のことだよ */ #include +#include #include "commonhd.h" #include "jslib.h" #include "jllib.h" --- FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/Makefile.in.xx 2005-06-15 16:08:06.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib/Makefile.in 2005-06-15 16:08:54.000000000 +0200 @@ -49,8 +49,8 @@ OBJ1= js.o wnnerrmsg.o jl.o -SRC2= getopt.c -OBJ2= getopt.o +SRC2= +OBJ2= SRC3= $(WNNETCSRC)/msg.c OBJ3= msg.o SRC4= $(WNNETCSRC)/yincoding.c @@ -87,19 +87,6 @@ all:: $(OBJS) libwnn.a -all:: libgetopt.a - -libgetopt.a: $(OBJ2) $(EXTRALIBRARYDEPS) - $(RM) $@ - $(AR) $@ $(OBJ2) - $(RANLIB) $@ - -lintlib:: llib-lgetopt.ln - -llib-lgetopt.ln: $(SRC2) $(EXTRALIBRARYDEPS) - $(RM) $@ - $(LINT) $(LINTLIBFLAG)getopt $(LINTFLAGS) $(SRC2) - js.o : js.c $(WNNETCSRC)/bdic.c $(WNNETCSRC)/pwd.c $(WNNETCSRC)/gethinsi.c lint: --- FreeWnn-1.1.1-a017/Xsi/cWnn/jlib/Makefile.in.xx 2005-06-15 16:13:51.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/cWnn/jlib/Makefile.in 2005-06-15 16:14:09.000000000 +0200 @@ -37,7 +37,7 @@ LIB_MT_DEFINES = LibraryMTDefines -LINKS = getopt.c jl.c js.c kankana.c wnnerrmsg.c +LINKS = jl.c js.c kankana.c wnnerrmsg.c JLIBDEFINES = -DWRITE_CHECK INCLUDES = -I$(CWNNINCLUDESRC) -I$(TOP) DEFINES = $(CWNNDEFINES) $(CWNNLANGDEF) $(JLIBDEFINES) @@ -50,8 +50,8 @@ OBJ1= js.o wnnerrmsg.o jl.o -SRC2= getopt.c -OBJ2= getopt.o +SRC2= +OBJ2= SRC3= $(CWNNETCSRC)/msg.c OBJ3= msg.o SRC4= $(CWNNETCSRC)/yincoding.c @@ -90,17 +90,6 @@ includes:: $(LINKS) -getopt.c: $(WNNJLIBSRC)/getopt.c - $(RM) $@ - $(LN) $? $@ - -includes:: getopt.c - -depend:: getopt.c - -clean:: - $(RM) getopt.c - jl.c: $(WNNJLIBSRC)/jl.c $(RM) $@ $(LN) $? $@ @@ -145,19 +134,6 @@ clean:: $(RM) wnnerrmsg.c -all:: libgetopt.a - -libgetopt.a: $(OBJ2) $(EXTRALIBRARYDEPS) - $(RM) $@ - $(AR) $@ $(OBJ2) - $(RANLIB) $@ - -lintlib:: llib-lgetopt.ln - -llib-lgetopt.ln: $(SRC2) $(EXTRALIBRARYDEPS) - $(RM) $@ - $(LINT) $(LINTLIBFLAG)getopt $(LINTFLAGS) $(SRC2) - js.o : js.c $(CWNNETCSRC)/bdic.c $(CWNNETCSRC)/pwd.c $(CWNNETCSRC)/gethinsi.c lint: --- FreeWnn-1.1.1-a017/Xsi/cWnn/jserver/Makefile.in.xx 2005-06-15 16:19:54.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/cWnn/jserver/Makefile.in 2005-06-15 16:20:03.000000000 +0200 @@ -50,8 +50,8 @@ OBJ0= de.o OBJ1= de_vars.o dispatch.o do_dic_env.o do_dic_no.o do_filecom.o error.o jbiki.o jbiki_b.o jishoop.o rd_jishoop.o readfile.o b_index.o jishosub.o jmt0.o malloc.o kai_area.o mknode0.o mknode1.o mknode2.o renbn_kai.o bnsetu_kai.o daibn_kai.o jikouho.o jikouho_d.o fzk.o atojis.o get_kaiarea.o snd_rcv.o do_henkan.o do_henkan1.o do_env.o do_hindo_s.o initjserv.o hinsi_list.o sisheng.o w_string.o -SRC2= $(CWNNJLIBSRC)/getopt.c -OBJ2= getopt.o +SRC2= +OBJ2= SRC3= $(CWNNJLIBSRC)/wnnerrmsg.c OBJ3= wnnerrmsg.o --- FreeWnn-1.1.1-a017/Xsi/kWnn/jlib/Makefile.in.xx 2005-06-15 16:24:30.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/kWnn/jlib/Makefile.in 2005-06-15 16:24:46.000000000 +0200 @@ -38,7 +38,7 @@ LIB_MT_DEFINES = LibraryMTDefines -LINKS = getopt.c jl.c js.c wnnerrmsg.c +LINKS = jl.c js.c wnnerrmsg.c JLIBDEFINES = -DWRITE_CHECK INCLUDES = -I$(KWNNINCLUDESRC) -I$(TOP) DEFINES = $(KWNNDEFINES) $(KWNNLANGDEF) $(CWNNLANGDEF) $(JLIBDEFINES) @@ -52,8 +52,8 @@ OBJ1= js.o wnnerrmsg.o jl.o -SRC2= getopt.c -OBJ2= getopt.o +SRC2= +OBJ2= SRC3= $(KWNNETCSRC)/msg.c OBJ3= msg.o SRC4= $(KWNNETCSRC)/strings.c @@ -94,17 +94,6 @@ includes:: $(LINKS) -getopt.c: $(WNNJLIBSRC)/getopt.c - $(RM) $@ - $(LN) $? $@ - -includes:: getopt.c - -depend:: getopt.c - -clean:: - $(RM) getopt.c - jl.c: $(WNNJLIBSRC)/jl.c $(RM) $@ $(LN) $? $@ @@ -138,19 +127,6 @@ clean:: $(RM) wnnerrmsg.c -all:: libgetopt.a - -libgetopt.a: $(OBJ2) $(EXTRALIBRARYDEPS) - $(RM) $@ - $(AR) $@ $(OBJ2) - $(RANLIB) $@ - -lintlib:: llib-lgetopt.ln - -llib-lgetopt.ln: $(SRC2) $(EXTRALIBRARYDEPS) - $(RM) $@ - $(LINT) $(LINTLIBFLAG)getopt $(LINTFLAGS) $(SRC2) - js.o : js.c $(KWNNETCSRC)/bdic.c $(KWNNETCSRC)/pwd.c $(KWNNETCSRC)/gethinsi.c lint: --- FreeWnn-1.1.1-a017/Xsi/kWnn/jserver/Makefile.in.xx 2005-06-15 16:28:10.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/kWnn/jserver/Makefile.in 2005-06-15 16:28:19.000000000 +0200 @@ -48,8 +48,8 @@ OBJ0= de.o OBJ1= de_vars.o dispatch.o do_dic_env.o do_dic_no.o do_filecom.o error.o jbiki.o jbiki_b.o jishoop.o rd_jishoop.o readfile.o b_index.o jishosub.o jmt0.o malloc.o kai_area.o mknode0.o mknode1.o mknode2.o renbn_kai.o bnsetu_kai.o daibn_kai.o jikouho.o jikouho_d.o fzk.o atojis.o get_kaiarea.o snd_rcv.o do_henkan.o do_henkan1.o do_env.o do_hindo_s.o initjserv.o hinsi_list.o sisheng.o w_string.o -SRC2= $(KWNNJLIBSRC)/getopt.c -OBJ2= getopt.o +SRC2= +OBJ2= SRC3= $(KWNNJLIBSRC)/wnnerrmsg.c OBJ3= wnnerrmsg.o --- FreeWnn-1.1.1-a017/Xsi/Wnn/romkan/rk_modread.c.xx 2005-06-15 16:36:32.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/romkan/rk_modread.c 2005-06-15 16:37:09.000000000 +0200 @@ -37,6 +37,7 @@ ***********************************************************************/ /* Version 3.0 */ +#include #include "rk_header.h" #include "rk_extvars.h" #ifdef WNNDEFAULT @@ -110,6 +111,7 @@ if (!mystrcmp (hyo[i].name, wd)) return (i); ERRMOD (9); + exit(1); /*NOTREACHED*/} /** モード表の読み込み */ --- FreeWnn-1.1.1-a017/Xsi/PubdicPlus/pod.c.xx 2005-06-15 16:35:54.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/PubdicPlus/pod.c 2005-06-15 16:36:02.000000000 +0200 @@ -1361,6 +1361,7 @@ } } +void shrinkargs (argv, n, count) char **argv; int n, count; --- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/initjserv.c.xx 2005-06-15 16:54:09.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/initjserv.c 2005-06-15 16:55:02.000000000 +0200 @@ -428,7 +428,7 @@ return (num); case 'd': case 'D': - return (atoi (*(st + 1))); + return atoi (st + 1); case 'o': case 'O': sscanf (st + 1, "%o", &num); --- FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/malloc.c.xx 2005-06-15 16:55:19.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jserver/malloc.c 2005-06-15 16:56:24.000000000 +0200 @@ -42,13 +42,7 @@ #undef realloc #undef free -#ifdef hpux -extern void *malloc (size_t); -extern void free (void *); -extern void *realloc (void *, size_t); -extern void *calloc (size_t, size_t); -#else -#endif /* hpux */ +#include #ifdef hpux void * --- FreeWnn-1.1.1-a017/Xsi/Wnn/jlib.V3/jlv3.c.xx 2005-06-15 17:02:52.000000000 +0200 +++ FreeWnn-1.1.1-a017/Xsi/Wnn/jlib.V3/jlv3.c 2005-06-15 17:03:22.000000000 +0200 @@ -52,6 +52,9 @@ #include +#include +#include +#include #include #include #include