From 4d217158cf62fd3dfeb782969438b62c572a7f37 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Mon, 3 Mar 2003 17:24:09 +0000 Subject: [PATCH] Portability to UnixWare. --- lib/ChangeLog | 7 +++++++ lib/mbswidth.h | 11 ++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index f454c4a6a..4158fe71b 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2003-03-03 Paul Eggert + Bruno Haible + + * mbswidth.h: Include . 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 * poll_.h: New file. diff --git a/lib/mbswidth.h b/lib/mbswidth.h index 40d4cba04..cd41c9f20 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 +/* Avoid a clash of our mbswidth() with a function of the same name defined + in UnixWare 7.1.1 . We need this #include before the #define + below. */ +#if HAVE_WCHAR_H +# include +#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); -- 2.11.0