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

don't use WEOF directly, for --disable-widechar.

This commit is contained in:
tnozaki 2011-11-23 15:43:39 +00:00
parent 3392bf8c1a
commit 5a00661245
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/nvi/common/multibyte.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: multibyte.h,v 1.6 2011/03/21 14:53:02 tnozaki Exp $ */
/* $NetBSD: multibyte.h,v 1.7 2011/11/23 15:43:39 tnozaki Exp $ */
#ifndef MULTIBYTE_H
#define MULTIBYTE_H
@ -37,6 +37,7 @@
#include <wctype.h>
typedef wchar_t RCHAR_T;
#define REOF WEOF
typedef wchar_t CHAR_T;
typedef wint_t ARG_CHAR_T;
typedef wint_t UCHAR_T;
@ -65,7 +66,10 @@ typedef wint_t UCHAR_T;
#define WC "%lc"
#else
#include <stdio.h>
typedef char RCHAR_T;
#define REOF EOF
typedef char CHAR_T;
typedef int ARG_CHAR_T;
typedef unsigned char UCHAR_T;

4
dist/nvi/regex/regex2.h vendored
View File

@ -1,4 +1,4 @@
/* $NetBSD: regex2.h,v 1.4 2011/11/19 17:45:11 tnozaki Exp $ */
/* $NetBSD: regex2.h,v 1.5 2011/11/23 15:43:39 tnozaki Exp $ */
/*-
* Copyright (c) 1992, 1993, 1994 Henry Spencer.
@ -170,5 +170,5 @@ struct re_guts {
};
/* misc utilities */
#define OUT WEOF /* a non-character value */
#define OUT REOF /* a non-character value */
#define ISWORD(c) ((c) == '_' || (ISGRAPH((UCHAR_T)c) && !ISPUNCT((UCHAR_T)c)))