Portability to UnixWare.

diff --git a/lib/ChangeLog b/lib/ChangeLog
index f454c4a6a611dfc844d882e61a730f0cde5a2aee..4158fe71bc4b3ba4500c0d31619e35baf84d3bb4 100644 (file)
--- a/lib/ChangeLog
+++ b/lib/ChangeLog
@@ -1,3 +1,10 @@
+2003-03-03  Paul Eggert  <eggert@twinsun.com>
+            Bruno Haible  <bruno@clisp.org>
+
+       * mbswidth.h: Include <wchar.h>. Needed for UnixWare 7.1.1.
+       Reported by John Hughes, see
+       http://mail.gnu.org/archive/html/bug-bison/2003-02/msg00030.html
+
 2003-02-19  Paolo Bonzino  <bonzini@gnu.org>
 
        * poll_.h: New file.

diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 40d4cba0419debe8bd3b802acf05ef59d6388ef8..cd41c9f20efbeb6545db9cdcd025890218b1cc1c 100644 (file)
--- a/lib/mbswidth.h
+++ b/lib/mbswidth.h
@@ -1,5 +1,5 @@
 /* Determine the number of screen columns needed for a string.
-   Copyright (C) 2000-2002 Free Software Foundation, Inc.
+   Copyright (C) 2000-2003 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -17,6 +17,14 @@
 
 #include <stddef.h>
 
+/* Avoid a clash of our mbswidth() with a function of the same name defined
+   in UnixWare 7.1.1 <wchar.h>.  We need this #include before the #define
+   below.  */
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+
+
 /* Optional flags to influence mbswidth/mbsnwidth behavior.  */
 
 /* If this bit is set, return -1 upon finding an invalid or incomplete
@@ -28,6 +36,7 @@
    control characters and 1 otherwise.  */
 #define MBSW_REJECT_UNPRINTABLE        2
 
+
 /* Returns the number of screen columns needed for STRING.  */
 #define mbswidth gnu_mbswidth  /* avoid clash with UnixWare 7.1.1 function */
 extern int mbswidth (const char *string, int flags);