From d65bac0ebeea2672d71c44a35c8e15a07fc6a2c7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 18 Mar 2004 13:36:53 +0000 Subject: [PATCH] Fix portability problem with Tru64 and BSD/OS. --- lib/ChangeLog | 7 +++++++ lib/mbswidth.c | 8 +++++++- lib/mbswidth.h | 11 ++++++++--- m4/ChangeLog | 6 ++++++ m4/mbswidth.m4 | 21 ++++++++++++++++++++- 5 files changed, 48 insertions(+), 5 deletions(-) diff --git a/lib/ChangeLog b/lib/ChangeLog index ee5b5f634c..0a315fe4ad 100644 --- a/lib/ChangeLog +++ b/lib/ChangeLog @@ -1,3 +1,10 @@ +2004-03-18 Paul Eggert + Bruno Haible + + * mbswidth.h: Include only if HAVE_DECL_MBSWIDTH_IN_WCHAR_H, + not on all platforms that have . + * mbswidth.c: Include and before . + 2004-03-09 Paul Eggert * argp-parse.c, getopt.c, getopt.h, getopt1.c: diff --git a/lib/mbswidth.c b/lib/mbswidth.c index c6f91db971..6b9d4b38bb 100644 --- a/lib/mbswidth.c +++ b/lib/mbswidth.c @@ -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-2004 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 @@ -34,6 +34,12 @@ /* Get mbstate_t, mbrtowc(), mbsinit(), wcwidth(). */ #if HAVE_WCHAR_H +/* Tru64 with Desktop Toolkit C has a bug: must be included before + . + BSD/OS 4.1 has a bug: and must be included before + . */ +# include +# include # include #endif diff --git a/lib/mbswidth.h b/lib/mbswidth.h index cd41c9f20e..6fec3f4904 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-2003 Free Software Foundation, Inc. + Copyright (C) 2000-2004 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 @@ -19,8 +19,13 @@ /* 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 + below. + However, we don't want to #include on all platforms because + - Tru64 with Desktop Toolkit C has a bug: must be included before + . + - BSD/OS 4.1 has a bug: and must be included before + . */ +#if HAVE_DECL_MBSWIDTH_IN_WCHAR_H # include #endif diff --git a/m4/ChangeLog b/m4/ChangeLog index 29bc12e5cc..8abf642bef 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,9 @@ +2004-03-18 Paul Eggert + Bruno Haible + + * mbswidth.m4 (gl_MBSWIDTH): Also test whether declares + mbswidth. + 2004-03-07 Paul Eggert * c-stack.m4 (gl_PREREQ_C_STACK): Renamed from jm_PREREQ_C_STACK. diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4 index d7981ca39b..7eefd879d2 100644 --- a/m4/mbswidth.m4 +++ b/m4/mbswidth.m4 @@ -1,4 +1,4 @@ -#serial 9 +#serial 10 dnl autoconf tests required for use of mbswidth.c dnl From Bruno Haible. @@ -32,5 +32,24 @@ AC_DEFUN([gl_MBSWIDTH], AC_DEFINE_UNQUOTED(HAVE_DECL_WCWIDTH, $ac_val, [Define to 1 if you have the declaration of wcwidth(), and to 0 otherwise.]) + dnl UnixWare 7.1.1 has a declaration of a function mbswidth() + dnl that clashes with ours. + AC_CACHE_CHECK([whether mbswidth is declared in ], + ac_cv_have_decl_mbswidth, + [AC_TRY_COMPILE([ +#if HAVE_WCHAR_H +# include +#endif +], [ + char *p = (char *) mbswidth; +], ac_cv_have_decl_mbswidth=yes, ac_cv_have_decl_mbswidth=no)]) + if test $ac_cv_have_decl_mbswidth = yes; then + ac_val=1 + else + ac_val=0 + fi + AC_DEFINE_UNQUOTED(HAVE_DECL_MBSWIDTH_IN_WCHAR_H, $ac_val, + [Define to 1 if you have a declaration of mbswidth() in , and to 0 otherwise.]) + AC_TYPE_MBSTATE_T ]) -- 2.30.2