# HG changeset patch # User Hauke Fath # Date 1270424004 -7200 # Node ID 587fde43ef738e90a507d1bc48defbf2cc9674e4 # Parent 1adfe934d6297e9a65439336369792bce1fead2c wchar: Port to NetBSD 1.5. diff --git a/ChangeLog b/ChangeLog --- 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 --- 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 --- 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