wchar: Port to NetBSD 1.5.

diff --git a/ChangeLog b/ChangeLog
index d62f2da..d2d2721 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2010-04-04  Hauke Fath  <hauke@espresso.rhein-neckar.de>  (tiny change)
             Bruno Haible  <bruno@clisp.org>
 
+       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  <hauke@espresso.rhein-neckar.de>  (tiny change)
+            Bruno Haible  <bruno@clisp.org>
+
        Port extended stdio to NetBSD 1.5.
        * lib/stdio-impl.h [NetBSD]: Include <sys/param.h>.
        (struct __sfileext, fp_ub): Define the "old way" for NetBSD 1.5Z and

diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index 3f96a85..fb4f105 100644 (file)
--- 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 8016203..6782478 100644 (file)
--- 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