bison 1.875 on UnixWare 7.1.1

[John Hughes]

Bison 1.875 doesn't compile on UnixWare 7.1.1:

cc -DHAVE_CONFIG_H -I. -I. -I.. -I.. -I../src -I../lib    -g -c `test -f
'mbswidth.c' || echo './'`mbswidth.c
UX:acomp: ERROR: "/usr/include/wchar.h", line 201: identifier
redeclared: gnu_mbswidth
UX:acomp: ERROR: "mbswidth.c", line 91: identifier redeclared:
gnu_mbswidth
gmake[2]: *** [mbswidth.o] Error 1

A simple fix is:

--- bison-1.875/lib/mbswidth.c.orig     Sat Nov 23 08:08:51 2002
+++ bison-1.875/lib/mbswidth.c  Wed Feb 26 13:16:46 2003
@@ -21,6 +21,12 @@
 # include <config.h>
 #endif
 
+/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth().  */
+/* (Must include before mbswidth.h) */
+#if HAVE_WCHAR_H
+# include <wchar.h>
+#endif
+
 /* Specification.  */
 #include "mbswidth.h"
 
@@ -31,11 +37,6 @@
 
 /* Get isprint().  */
 #include <ctype.h>
-
-/* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth().  */
-#if HAVE_WCHAR_H
-# include <wchar.h>
-#endif
 
 /* Get iswprint(), iswcntrl().  */
 #if HAVE_WCTYPE_H