wchar: Port to NetBSD 1.5.

diff --git a/ChangeLog b/ChangeLog
index d62f2daeda7e61da6f32109a382b339323cd5b11..d2d2721b7e2987eee96ce8db71f8d6da91697a40 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+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>
 

diff --git a/lib/wchar.in.h b/lib/wchar.in.h
index 3f96a8548964e46c46612cdd26d58d5c047ed582..fb4f1058dc8bf9fc0f822e46ff46824f085ccc5b 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 8016203060c2c7b24ae97eb24422663f65c3cbc9..6782478107801696c3bb6d37a7fd564653b16a1c 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