From a2c5c0940ec9098277c788906e26d3afe6cf7f51 Mon Sep 17 00:00:00 2001 From: Hauke Fath Date: Mon, 5 Apr 2010 01:33:24 +0200 Subject: [PATCH] wchar: Port to NetBSD 1.5. --- ChangeLog | 7 +++++++ lib/wchar.in.h | 6 +++++- lib/wctype.in.h | 6 +++++- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d62f2daeda..d2d2721b7e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2010-04-04 Hauke Fath (tiny change) + Bruno Haible + + wchar: Port to NetBSD 1.5. + * lib/wchar.in.h (WEOF): Provide fallback also when wint_t exists. + * lib/wctype.in.h (WEOF): Likewise. + 2010-04-04 Hauke Fath (tiny change) Bruno Haible diff --git a/lib/wchar.in.h b/lib/wchar.in.h index 3f96a85489..fb4f1058dc 100644 --- a/lib/wchar.in.h +++ b/lib/wchar.in.h @@ -82,12 +82,16 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ -/* Define wint_t. (Also done in wctype.in.h.) */ +/* Define wint_t and WEOF. (Also done in wctype.in.h.) */ #if !@HAVE_WINT_T@ && !defined wint_t # define wint_t int # ifndef WEOF # define WEOF -1 # endif +#else +# ifndef WEOF +# define WEOF ((wint_t) -1) +# endif #endif diff --git a/lib/wctype.in.h b/lib/wctype.in.h index 8016203060..6782478107 100644 --- a/lib/wctype.in.h +++ b/lib/wctype.in.h @@ -58,12 +58,16 @@ /* The definition of _GL_WARN_ON_USE is copied here. */ -/* Define wint_t. (Also done in wchar.in.h.) */ +/* Define wint_t and WEOF. (Also done in wchar.in.h.) */ #if !@HAVE_WINT_T@ && !defined wint_t # define wint_t int # ifndef WEOF # define WEOF -1 # endif +#else +# ifndef WEOF +# define WEOF ((wint_t) -1) +# endif #endif -- 2.30.2