[src/trunk]: src/dist/nvi don't use WEOF directly, for --disable-widechar.

[tnozaki <tnozaki%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c2c6f171b032
branches:  trunk
changeset: 771493:c2c6f171b032
user:      tnozaki <tnozaki%NetBSD.org@localhost>
date:      Wed Nov 23 15:43:39 2011 +0000

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

diffstat:

 dist/nvi/common/multibyte.h |  6 +++++-
 dist/nvi/regex/regex2.h     |  4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (44 lines):

diff -r 1879bb8a3b3c -r c2c6f171b032 dist/nvi/common/multibyte.h
--- a/dist/nvi/common/multibyte.h       Wed Nov 23 14:14:43 2011 +0000
+++ b/dist/nvi/common/multibyte.h       Wed Nov 23 15:43:39 2011 +0000
@@ -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 @@
 #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;
diff -r 1879bb8a3b3c -r c2c6f171b032 dist/nvi/regex/regex2.h
--- a/dist/nvi/regex/regex2.h   Wed Nov 23 14:14:43 2011 +0000
+++ b/dist/nvi/regex/regex2.h   Wed Nov 23 15:43:39 2011 +0000
@@ -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 @@
 };
 
 /* 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)))