From: Jim Meyering <jim@meyering.net>
Date: Tue, 11 Mar 2003 10:08:15 +0000 (+0000)
Subject: Include <wchar.h>. Needed for UnixWare 7.1.1.
X-Git-Tag: v4.5.10~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d7103af2bcca05c702beb63938f5d974c315dff4;p=thirdparty%2Fcoreutils.git

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
---

diff --git a/lib/mbswidth.h b/lib/mbswidth.h
index 40d4cba041..b3646ea2d9 100644
--- 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