Fix non-wide build botches.

This commit is contained in:
christos 2008-08-27 10:18:41 +00:00
parent 6677e30757
commit c041c3f557
3 changed files with 12 additions and 7 deletions

View File

@ -1,4 +1,4 @@
/* $NetBSD: key.c,v 1.1.1.2 2008/05/18 14:29:46 aymeric Exp $ */
/* $NetBSD: key.c,v 1.2 2008/08/27 10:18:41 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -104,7 +104,7 @@ static int nkeylist =
int
v_key_init(SCR *sp)
{
CHAR_T ch;
int ch;
GS *gp;
KEYLIST *kp;
int cnt;

View File

@ -1,4 +1,4 @@
/* $NetBSD: util.c,v 1.1.1.2 2008/05/18 14:29:52 aymeric Exp $ */
/* $NetBSD: util.c,v 1.2 2008/08/27 10:18:41 christos Exp $ */
/*-
* Copyright (c) 1991, 1993, 1994
@ -165,7 +165,7 @@ enum nresult
nget_uslong(SCR *sp, u_long *valp, const CHAR_T *p, CHAR_T **endp, int base)
{
errno = 0;
*valp = STRTOUL(p, endp, base);
*valp = STRTOUL(p, (RCHAR_T **)endp, base);
if (errno == 0)
return (NUM_OK);
if (errno == ERANGE && *valp == ULONG_MAX)
@ -183,7 +183,7 @@ enum nresult
nget_slong(SCR *sp, long int *valp, const CHAR_T *p, CHAR_T **endp, int base)
{
errno = 0;
*valp = STRTOL(p, endp, base);
*valp = STRTOL(p, (RCHAR_T **)endp, base);
if (errno == 0)
return (NUM_OK);
if (errno == ERANGE) {

9
dist/nvi/vi/vi.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: vi.h,v 1.1.1.2 2008/05/18 14:31:49 aymeric Exp $ */
/* $NetBSD: vi.h,v 1.2 2008/08/27 10:18:41 christos Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994
@ -12,7 +12,12 @@
*/
/* Definition of a vi "word". */
#define inword(ch) ((UCHAR_T)ch <= 255 && (isalnum(ch) || (ch) == '_'))
#ifdef USE_WIDECHAR
#define inword(ch) ((UCHAR_T)ch <= 255 && \
(isalnum((unsigned char)ch) || (ch) == '_'))
#else
#define inword(ch) (isalnum((UCHAR_T)ch) || (ch) == '_')
#endif
typedef struct _vikeys VIKEYS;