Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

more compilation issues on amd64, where size_t != unsigned int.

This commit is contained in:
christos 2008-12-06 18:39:20 +00:00
parent 859dc97d79
commit 448e9aef12
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/nvi/common/conv.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: conv.c,v 1.4 2008/12/05 22:51:42 christos Exp $ */
/* $NetBSD: conv.c,v 1.5 2008/12/06 18:39:20 christos Exp $ */
/*-
* Copyright (c) 1993, 1994
@ -212,7 +212,8 @@ static int
default_int2char(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw,
size_t *tolen, const char **pdst, const char *enc)
{
int i, j, offset = 0;
size_t i, j;
int offset = 0;
char **tostr = (char **)(void *)&cw->bp1;
size_t *blen = &cw->blen1;
mbstate_t mbs;
@ -240,7 +241,7 @@ default_int2char(SCR *sp, const CHAR_T * str, ssize_t len, CONVWIN *cw,
BINC_RETC(NULL, cw->bp1, cw->blen1, nlen); \
} \
errno = 0; \
if (iconv(id, &bp, (size_t *) &len, &obp, &outleft) == -1 && \
if (iconv(id, &bp, &len, &obp, &outleft) == -1 && \
errno != E2BIG) \
goto err; \
offset = cw->blen1 - outleft; \

4
dist/nvi/ex/ex_cscope.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ex_cscope.c,v 1.2 2008/12/05 22:51:42 christos Exp $ */
/* $NetBSD: ex_cscope.c,v 1.3 2008/12/06 18:39:20 christos Exp $ */
/*-
* Copyright (c) 1994, 1996
@ -502,7 +502,7 @@ cscope_find(SCR *sp, EXCMD *cmdp, const CHAR_T *pattern)
* search cscope command character and a leading space
* there.)
*/
(void)fprintf(csc->to_fp, "%d%s\n", search, tqp->tag + 2);
(void)fprintf(csc->to_fp, "%zu%s\n", search, tqp->tag + 2);
(void)fflush(csc->to_fp);
/* Read the output. */

4
dist/nvi/ex/ex_tag.c vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: ex_tag.c,v 1.4 2008/12/05 22:51:42 christos Exp $ */
/* $NetBSD: ex_tag.c,v 1.5 2008/12/06 18:39:20 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@ -348,7 +348,7 @@ int
ex_tag_pop(SCR *sp, EXCMD *cmdp)
{
EX_PRIVATE *exp;
TAGQ *tqp, *dtqp;
TAGQ *tqp, *dtqp = NULL;
size_t arglen;
long off;
const char *arg;