Module Name: src
Committed By: tnozaki
Date: Wed Nov 23 15:43:39 UTC 2011
Modified Files:
src/dist/nvi/common: multibyte.h
src/dist/nvi/regex: regex2.h
Log Message:
don't use WEOF directly, for --disable-widechar.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/dist/nvi/common/multibyte.h
cvs rdiff -u -r1.4 -r1.5 src/dist/nvi/regex/regex2.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/dist/nvi/common/multibyte.h
diff -u src/dist/nvi/common/multibyte.h:1.6 src/dist/nvi/common/multibyte.h:1.7
--- src/dist/nvi/common/multibyte.h:1.6 Mon Mar 21 14:53:02 2011
+++ src/dist/nvi/common/multibyte.h Wed Nov 23 15:43:39 2011
@@ -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;
Index: src/dist/nvi/regex/regex2.h
diff -u src/dist/nvi/regex/regex2.h:1.4 src/dist/nvi/regex/regex2.h:1.5
--- src/dist/nvi/regex/regex2.h:1.4 Sat Nov 19 17:45:11 2011
+++ src/dist/nvi/regex/regex2.h Wed Nov 23 15:43:39 2011
@@ -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)))
