Re: BISON 1.875 on UnixWare 7.1.3 (fwd)

[Paul Eggert]

Larry Rosenman <address@hidden> writes:

> cc -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I../src -I../lib -I/usr/local/include
> -O -c `test -f 'mbswidth.c' || echo './'`mbswidth.c UX:acomp: ERROR:
> "/usr/include/wchar.h", line 197: identifier redeclared: gnu_mbswidth
> UX:acomp: ERROR: "mbswidth.c", line 91: identifier redeclared: gnu_mbswidth

Thanks for the bug report.  We've installed the following patch into
the CVS copy of Bison.

2003-03-03  Paul Eggert  <address@hidden>
            Bruno Haible  <address@hidden>

        * 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

--- lib/mbswidth.h      2002-11-22 23:08:51.000000000 -0800
+++ ../gnu/gnulib/lib/mbswidth.h        2003-03-03 09:24:09.000000000 -0800
@@ -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