head 1.3; access; symbols pkgsrc-2026Q1:1.3.0.118 pkgsrc-2026Q1-base:1.3 pkgsrc-2025Q4:1.3.0.116 pkgsrc-2025Q4-base:1.3 pkgsrc-2025Q3:1.3.0.114 pkgsrc-2025Q3-base:1.3 pkgsrc-2025Q2:1.3.0.112 pkgsrc-2025Q2-base:1.3 pkgsrc-2025Q1:1.3.0.110 pkgsrc-2025Q1-base:1.3 pkgsrc-2024Q4:1.3.0.108 pkgsrc-2024Q4-base:1.3 pkgsrc-2024Q3:1.3.0.106 pkgsrc-2024Q3-base:1.3 pkgsrc-2024Q2:1.3.0.104 pkgsrc-2024Q2-base:1.3 pkgsrc-2024Q1:1.3.0.102 pkgsrc-2024Q1-base:1.3 pkgsrc-2023Q4:1.3.0.100 pkgsrc-2023Q4-base:1.3 pkgsrc-2023Q3:1.3.0.98 pkgsrc-2023Q3-base:1.3 pkgsrc-2023Q2:1.3.0.96 pkgsrc-2023Q2-base:1.3 pkgsrc-2023Q1:1.3.0.94 pkgsrc-2023Q1-base:1.3 pkgsrc-2022Q4:1.3.0.92 pkgsrc-2022Q4-base:1.3 pkgsrc-2022Q3:1.3.0.90 pkgsrc-2022Q3-base:1.3 pkgsrc-2022Q2:1.3.0.88 pkgsrc-2022Q2-base:1.3 pkgsrc-2022Q1:1.3.0.86 pkgsrc-2022Q1-base:1.3 pkgsrc-2021Q4:1.3.0.84 pkgsrc-2021Q4-base:1.3 pkgsrc-2021Q3:1.3.0.82 pkgsrc-2021Q3-base:1.3 pkgsrc-2021Q2:1.3.0.80 pkgsrc-2021Q2-base:1.3 pkgsrc-2021Q1:1.3.0.78 pkgsrc-2021Q1-base:1.3 pkgsrc-2020Q4:1.3.0.76 pkgsrc-2020Q4-base:1.3 pkgsrc-2020Q3:1.3.0.74 pkgsrc-2020Q3-base:1.3 pkgsrc-2020Q2:1.3.0.70 pkgsrc-2020Q2-base:1.3 pkgsrc-2020Q1:1.3.0.50 pkgsrc-2020Q1-base:1.3 pkgsrc-2019Q4:1.3.0.72 pkgsrc-2019Q4-base:1.3 pkgsrc-2019Q3:1.3.0.68 pkgsrc-2019Q3-base:1.3 pkgsrc-2019Q2:1.3.0.66 pkgsrc-2019Q2-base:1.3 pkgsrc-2019Q1:1.3.0.64 pkgsrc-2019Q1-base:1.3 pkgsrc-2018Q4:1.3.0.62 pkgsrc-2018Q4-base:1.3 pkgsrc-2018Q3:1.3.0.60 pkgsrc-2018Q3-base:1.3 pkgsrc-2018Q2:1.3.0.58 pkgsrc-2018Q2-base:1.3 pkgsrc-2018Q1:1.3.0.56 pkgsrc-2018Q1-base:1.3 pkgsrc-2017Q4:1.3.0.54 pkgsrc-2017Q4-base:1.3 pkgsrc-2017Q3:1.3.0.52 pkgsrc-2017Q3-base:1.3 pkgsrc-2017Q2:1.3.0.48 pkgsrc-2017Q2-base:1.3 pkgsrc-2017Q1:1.3.0.46 pkgsrc-2017Q1-base:1.3 pkgsrc-2016Q4:1.3.0.44 pkgsrc-2016Q4-base:1.3 pkgsrc-2016Q3:1.3.0.42 pkgsrc-2016Q3-base:1.3 pkgsrc-2016Q2:1.3.0.40 pkgsrc-2016Q2-base:1.3 pkgsrc-2016Q1:1.3.0.38 pkgsrc-2016Q1-base:1.3 pkgsrc-2015Q4:1.3.0.36 pkgsrc-2015Q4-base:1.3 pkgsrc-2015Q3:1.3.0.34 pkgsrc-2015Q3-base:1.3 pkgsrc-2015Q2:1.3.0.32 pkgsrc-2015Q2-base:1.3 pkgsrc-2015Q1:1.3.0.30 pkgsrc-2015Q1-base:1.3 pkgsrc-2014Q4:1.3.0.28 pkgsrc-2014Q4-base:1.3 pkgsrc-2014Q3:1.3.0.26 pkgsrc-2014Q3-base:1.3 pkgsrc-2014Q2:1.3.0.24 pkgsrc-2014Q2-base:1.3 pkgsrc-2014Q1:1.3.0.22 pkgsrc-2014Q1-base:1.3 pkgsrc-2013Q4:1.3.0.20 pkgsrc-2013Q4-base:1.3 pkgsrc-2013Q3:1.3.0.18 pkgsrc-2013Q3-base:1.3 pkgsrc-2013Q2:1.3.0.16 pkgsrc-2013Q2-base:1.3 pkgsrc-2013Q1:1.3.0.14 pkgsrc-2013Q1-base:1.3 pkgsrc-2012Q4:1.3.0.12 pkgsrc-2012Q4-base:1.3 pkgsrc-2012Q3:1.3.0.10 pkgsrc-2012Q3-base:1.3 pkgsrc-2012Q2:1.3.0.8 pkgsrc-2012Q2-base:1.3 pkgsrc-2012Q1:1.3.0.6 pkgsrc-2012Q1-base:1.3 pkgsrc-2011Q4:1.3.0.4 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q3:1.3.0.2 pkgsrc-2011Q3-base:1.3 pkgsrc-2011Q2:1.2.0.12 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.10 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.8 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.6 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.4 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.2 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.1.0.2 pkgsrc-2009Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2011.09.13.07.28.48; author mef; state Exp; branches; next 1.2; 1.2 date 2010.02.15.13.41.18; author obache; state Exp; branches; next 1.1; 1.1 date 2010.01.09.11.50.36; author obache; state Exp; branches; next ; desc @@ 1.3 log @* PKGREVISION = 2 * To compile with ja-freewnn-lib-1.11alpha22, small patches added for mainly with adding include directive: --- +#include +#include +#include +#include ---- the patches are listed below. patch-cmd_kinput2.c patch-lib_Canna.c patch-lib_ConvCtrl.c patch-lib_KIProto.c patch-lib_XimpProto.c patch-lib_ctext.c patch-lib_wnnlib.c @ text @$NetBSD: patch-ac,v 1.3 2011/09/13 06:41:28 makoto Exp $ Avoid to conflict with getline(3) in IEEE Std 1003.1-2008. --- lib/cconv.c.orig 2002-10-03 09:35:28.000000000 +0000 +++ lib/cconv.c @@@@ -604,6 +604,7 @@@@ static char *rcsid = "$Id: cconv.c,v 10. #endif #include +#include #include #include #include @@@@ -790,7 +791,7 @@@@ static wchar *promptsave(wchar *); static int parseLine(uchar *, uchar **, int); static FILE *openfile(char *); static int doinclude(uchar *, Files *, void (*)()); -static uchar *getline(uchar *, int, Files *, void (*)()); +static uchar *get_line(uchar *, int, Files *, void (*)()); static int readRuleFile(ccRule, char *); static int registMode(ccRule, int, uchar **); static int newMode(ccRule, Files *, _strbufRec *, _funcbufRec *, @@@@ -1035,8 +1036,8 @@@@ void (*efunc)(); return 0; } -/* getline -- 1行読み込む (その際 include の処理を行なう) */ -static uchar *getline(line, linesize, files, efunc) +/* get_line -- 1行読み込む (その際 include の処理を行なう) */ +static uchar *get_line(line, linesize, files, efunc) uchar *line; int linesize; Files *files; @@@@ -1100,7 +1101,7 @@@@ char *file; rule->nmode = 0; rule->initialmode = -1; - while (getline(line, sizeof(line), &files, efunc)) { + while (get_line(line, sizeof(line), &files, efunc)) { (void)Strcpy(tmp, line); if ((argc = parseLine(tmp, argv, 20)) == 0) continue; @@@@ -1269,7 +1270,7 @@@@ uchar **av; cdbuf.cdbuf = NULL; /* ルールを読んでストアする */ - while (getline(line, sizeof(line), files, efunc)) { + while (get_line(line, sizeof(line), files, efunc)) { /* '#' で始まる行はコメント */ if (*line == '\0' || *line == '\n' || *line == '#') continue; @@@@ -1282,7 +1283,7 @@@@ uchar **av; } /* ルールのストア */ - cdp->key = inkey; + cdp->key = (ulong *) inkey; cdp->mask = modmask; cdp->context = *context ? wstrsave(srec, wrev(context)) : 0; cdp->result = *result ? wstrsave(srec, result) : 0; @ 1.2 log @Update kinput2 to 3.1. Major changes from version 3.0 to 3.1: * Kinput2 now supports ATOK. The source code is kindly contributed by Justsystem Corporation. Thanks! To compile for Atok, define symbol `UseAtok' in Kinput2.conf. * Minimum support of Wnn7 is implemented. * Two IC attributes, XNPreeditState and XNResetState both of which are introduced by X11R6, are supported. * Kinput2's `egg'-emulation is improved. * A workaround for bugs in some Xlib implementations has been added. * Previously, when kinput2 cannot connect to jserver, kinput2 seems to be frozen (actually it keeps retrying). Now kinput2 beeps and ends conversion in such a case. The next time you start conversion, it tries to connect again. @ text @d1 1 a1 1 $NetBSD: patch-ac,v 1.1 2010/01/09 11:50:36 obache Exp $ d7 9 a15 1 @@@@ -790,7 +790,7 @@@@ static wchar *promptsave(wchar *); d24 1 a24 1 @@@@ -1035,8 +1035,8 @@@@ void (*efunc)(); d35 1 a35 1 @@@@ -1100,7 +1100,7 @@@@ char *file; d44 1 a44 1 @@@@ -1269,7 +1269,7 @@@@ uchar **av; d53 9 @ 1.1 log @Add patch-ac to avoid conflict with getline(3) in IEEE Std 1003.1-2008. PR#42595. @ text @d1 1 a1 1 $NetBSD$ d5 1 a5 1 --- lib/cconv.c.orig 1999-05-26 23:55:25.000000000 +0000 d7 1 a7 1 @@@@ -767,7 +767,7 @@@@ static wchar *promptsave(wchar *); d16 1 a16 1 @@@@ -1012,8 +1012,8 @@@@ void (*efunc)(); d27 1 a27 1 @@@@ -1077,7 +1077,7 @@@@ char *file; d36 1 a36 1 @@@@ -1246,7 +1246,7 @@@@ uchar **av; @