Mercurial > gnulib

changeset 13152:587fde43ef73

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wchar: Port to NetBSD 1.5.
author Hauke Fath <hauke@espresso.rhein-neckar.de>
date Mon, 05 Apr 2010 01:33:24 +0200
parents 1adfe934d629
children 5566a3e85a6d
files ChangeLog lib/wchar.in.h lib/wctype.in.h
diffstat 3 files changed, 17 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Apr 05 01:13:18 2010 +0200
+++ b/ChangeLog	Mon Apr 05 01:33:24 2010 +0200
@@ -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>
 
--- a/lib/wchar.in.h	Mon Apr 05 01:13:18 2010 +0200
+++ b/lib/wchar.in.h	Mon Apr 05 01:33:24 2010 +0200
@@ -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
 
 
--- a/lib/wctype.in.h	Mon Apr 05 01:13:18 2010 +0200
+++ b/lib/wctype.in.h	Mon Apr 05 01:33:24 2010 +0200
@@ -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