diff -ruN anthy-8300.org/calctrans/calctrans.c anthy-8300/calctrans/calctrans.c --- anthy-8300.org/calctrans/calctrans.c 2006-09-30 00:35:07.000000000 +0900 +++ anthy-8300/calctrans/calctrans.c 2006-12-23 16:18:01.358098022 +0900 @@ -68,19 +68,22 @@ classes[0] = SEG_HEAD; str = buf; /**/ - while ((tok = strsep(&str, " \t\n\r"))) { + tok = strtok(str, " \t\n\r"); + while (tok != NULL) { int sc; if (strlen(tok) == 0) { - continue; + goto next_tok; } x ++; if ((x % 2)) { - continue; + goto next_tok; } sc = anthy_seg_class_by_name(tok); printf("(%d)", sc); classes[nr] = sc; nr++; +next_tok: + tok = strtok(NULL, " \t\n\r"); } /**/ classes[nr] = SEG_TAIL; diff -ruN anthy-8300.org/depgraph/mkdepgraph.c anthy-8300/depgraph/mkdepgraph.c --- anthy-8300.org/depgraph/mkdepgraph.c 2006-07-07 21:38:05.000000000 +0900 +++ anthy-8300/depgraph/mkdepgraph.c 2006-12-23 16:17:41.023939859 +0900 @@ -11,6 +11,7 @@ #include #include +#include #include #include #include diff -ruN anthy-8300.org/mkworddic/mkdic.c anthy-8300/mkworddic/mkdic.c --- anthy-8300.org/mkworddic/mkdic.c 2006-07-07 21:39:04.000000000 +0900 +++ anthy-8300/mkworddic/mkdic.c 2006-12-23 16:17:41.026156980 +0900 @@ -40,6 +40,7 @@ #include #include #include +#include #include diff -ruN anthy-8300.org/src-diclib/ruleparser.c anthy-8300/src-diclib/ruleparser.c --- anthy-8300.org/src-diclib/ruleparser.c 2006-08-29 07:36:05.000000000 +0900 +++ anthy-8300/src-diclib/ruleparser.c 2006-12-23 16:17:41.027129132 +0900 @@ -9,6 +9,7 @@ #include #include #include +#include #include #include diff -ruN anthy-8300.org/src-diclib/xstr.c anthy-8300/src-diclib/xstr.c --- anthy-8300.org/src-diclib/xstr.c 2006-09-03 00:30:13.000000000 +0900 +++ anthy-8300/src-diclib/xstr.c 2006-12-23 16:17:41.028310982 +0900 @@ -16,6 +16,7 @@ #include #include #include +#include #include "config.h" /* for ANTHY_*_ENCODING */ diff -ruN anthy-8300.org/src-ordering/commit.c anthy-8300/src-ordering/commit.c --- anthy-8300.org/src-ordering/commit.c 2006-07-15 11:13:17.000000000 +0900 +++ anthy-8300/src-ordering/commit.c 2006-12-23 16:17:41.029244170 +0900 @@ -9,6 +9,7 @@ #include #include +#include #include "splitter.h" #include "segment.h" #include "sorter.h" diff -ruN anthy-8300.org/src-splitter/splitter.c anthy-8300/src-splitter/splitter.c --- anthy-8300.org/src-splitter/splitter.c 2006-05-13 18:29:10.000000000 +0900 +++ anthy-8300/src-splitter/splitter.c 2006-12-23 16:17:41.030321047 +0900 @@ -35,6 +35,7 @@ #include #include +#include #include #include #include diff -ruN anthy-8300.org/src-util/rkconv.c anthy-8300/src-util/rkconv.c --- anthy-8300.org/src-util/rkconv.c 2006-05-13 18:28:36.000000000 +0900 +++ anthy-8300/src-util/rkconv.c 2006-12-23 16:17:41.031808302 +0900 @@ -12,6 +12,7 @@ #include #include #include +#include #include "rkconv.h" diff -ruN anthy-8300.org/src-util/rkhelper.c anthy-8300/src-util/rkhelper.c --- anthy-8300.org/src-util/rkhelper.c 2006-05-13 18:28:36.000000000 +0900 +++ anthy-8300/src-util/rkhelper.c 2006-12-23 16:17:41.032968612 +0900 @@ -11,6 +11,7 @@ #include #include #include "rkconv.h" +#include #include "rkhelper.h" static const char* rk_default_symbol[128] = { diff -ruN anthy-8300.org/src-worddic/priv_dic.c anthy-8300/src-worddic/priv_dic.c --- anthy-8300.org/src-worddic/priv_dic.c 2006-07-30 13:52:17.000000000 +0900 +++ anthy-8300/src-worddic/priv_dic.c 2006-12-23 16:17:41.033927567 +0900 @@ -19,6 +19,7 @@ #include #include #include +#include #include "dic_main.h" /* ¸Ä¿Í¼­½ñ */ diff -ruN anthy-8300.org/src-worddic/record.c anthy-8300/src-worddic/record.c --- anthy-8300.org/src-worddic/record.c 2006-07-13 00:19:10.000000000 +0900 +++ anthy-8300/src-worddic/record.c 2006-12-23 16:17:41.037400579 +0900 @@ -46,6 +46,7 @@ #include "config.h" #include #include +#include #include #include #include diff -ruN anthy-8300.org/src-worddic/texttrie.c anthy-8300/src-worddic/texttrie.c --- anthy-8300.org/src-worddic/texttrie.c 2006-05-13 18:29:09.000000000 +0900 +++ anthy-8300/src-worddic/texttrie.c 2006-12-23 16:17:41.039659985 +0900 @@ -55,6 +55,7 @@ #include #include #include +#include #include "texttrie.h" #include "dic_main.h" #include "filemap.h" diff -ruN anthy-8300.org/src-worddic/word_lookup.c anthy-8300/src-worddic/word_lookup.c --- anthy-8300.org/src-worddic/word_lookup.c 2006-07-30 14:21:59.000000000 +0900 +++ anthy-8300/src-worddic/word_lookup.c 2006-12-23 16:17:41.040904877 +0900 @@ -39,6 +39,7 @@ #include "config.h" #include +#include #include #include #include diff -ruN anthy-8300.org/test/main.c anthy-8300/test/main.c --- anthy-8300.org/test/main.c 2006-08-31 00:01:04.000000000 +0900 +++ anthy-8300/test/main.c 2006-12-23 16:17:41.042028023 +0900 @@ -22,6 +22,7 @@ #include #include #include +#include #include #include