From db844e48b469f59ccfc7da42677040700b8eace9 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 27 Dec 2006 19:54:25 +0000 Subject: [PATCH] * lib/mbchar.h: Just include ; the wctype module handles its gotchas now. * lib/mbswidth.c: Likewise. * lib/wcwidth.h: Likewise. * m4/mbchar.m4 (gl_MBCHAR): Don't bother checking for wctype.h and iswcntrl; the wctype module does this stuff now. * m4/mbswidth.m4 (gl_MBSWIDTH): Likewise. * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise. * modules/mbchar (Depends-on): Add wctype. * modules/mbswidth (Depends-on): Likewise. * modules/wcwidth (Depends-on): Likewise. --- ChangeLog | 14 ++++++ lib/mbchar.h | 127 +------------------------------------------------------ lib/mbswidth.c | 7 +-- lib/wcwidth.h | 18 +------- m4/mbchar.m4 | 3 -- m4/mbswidth.m4 | 3 +- m4/wcwidth.m4 | 4 +- modules/mbchar | 2 +- modules/mbswidth | 2 +- modules/wcwidth | 1 + 10 files changed, 23 insertions(+), 158 deletions(-) diff --git a/ChangeLog b/ChangeLog index e2b29683e..92ef51bab 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2006-12-27 Paul Eggert + + * lib/mbchar.h: Just include ; the wctype module + handles its gotchas now. + * lib/mbswidth.c: Likewise. + * lib/wcwidth.h: Likewise. + * m4/mbchar.m4 (gl_MBCHAR): Don't bother checking for wctype.h + and iswcntrl; the wctype module does this stuff now. + * m4/mbswidth.m4 (gl_MBSWIDTH): Likewise. + * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise. + * modules/mbchar (Depends-on): Add wctype. + * modules/mbswidth (Depends-on): Likewise. + * modules/wcwidth (Depends-on): Likewise. + 2006-12-27 Eric Blake * lib/fnmatch.c: Reinstate inclusion of , since this diff --git a/lib/mbchar.h b/lib/mbchar.h index a0c2cdcb9..f3e28ef5c 100644 --- a/lib/mbchar.h +++ b/lib/mbchar.h @@ -155,132 +155,7 @@ #include #include #include - -/* BeOS 5 has the functions but no . */ -#if HAVE_WCTYPE_H -# include -#endif -/* FreeBSD 4.4 to 4.11 has but lacks the functions. - Assume all 12 functions are implemented the same way, or not at all. */ -#if !defined iswalnum && !HAVE_ISWCNTRL -static inline int -iswalnum (wint_t wc) -{ - return (wc >= 0 && wc < 128 - ? (wc >= '0' && wc <= '9') || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z') - : 0); -} -# define iswalnum iswalnum -#endif -#if !defined iswalpha && !HAVE_ISWCNTRL -static inline int -iswalpha (wint_t wc) -{ - return (wc >= 0 && wc < 128 - ? (wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z' - : 0); -} -# define iswalpha iswalpha -#endif -#if !defined iswblank && !HAVE_ISWCNTRL -static inline int -iswblank (wint_t wc) -{ - return (wc >= 0 && wc < 128 - ? wc == ' ' || wc == '\t' - : 0); -} -# define iswblank iswblank -#endif -#if !defined iswcntrl && !HAVE_ISWCNTRL -static inline int -iswcntrl (wint_t wc) -{ - return (wc >= 0 && wc < 128 - ? (wc & ~0x1f) == 0 || wc == 0x7f - : 0); -} -# define iswcntrl iswcntrl -#endif -#if !defined iswdigit && !HAVE_ISWCNTRL -static inline int -iswdigit (wint_t wc) -{ - return (wc >= '0' && wc <= '9'); -} -# define iswdigit iswdigit -#endif -#if !defined iswgraph && !HAVE_ISWCNTRL -static inline int -iswgraph (wint_t wc) -{ - return (wc >= 0 && wc < 128 - ? wc >= '!' && wc <= '~' - : 1); -} -# define iswgraph iswgraph -#endif -#if !defined iswlower && !HAVE_ISWCNTRL -static inline int -iswlower (wint_t wc) -{ - return (wc >= 0 && wc < 128 - ? wc >= 'a' && wc <= 'z' - : 0); -} -# define iswlower iswlower -#endif -#if !defined iswprint && !HAVE_ISWCNTRL -static inline int -iswprint (wint_t wc) -{ - return (wc >= 0 && wc < 128 - ? wc >= ' ' && wc <= '~' - : 1); -} -# define iswprint iswprint -#endif -#if !defined iswpunct && !HAVE_ISWCNTRL -static inline int -iswpunct (wint_t wc) -{ - return (wc >= 0 && wc < 128 - ? wc >= '!' && wc <= '~' - && !((wc >= '0' && wc <= '9') - || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'Z')) - : 1); -} -# define iswpunct iswpunct -#endif -#if !defined iswspace && !HAVE_ISWCNTRL -static inline int -iswspace (wint_t wc) -{ - return (wc >= 0 && wc < 128 - ? wc == ' ' || wc == '\t' - || wc == '\n' || wc == '\v' || wc == '\f' || wc == '\r' - : 0); -} -# define iswspace iswspace -#endif -#if !defined iswupper && !HAVE_ISWCNTRL -static inline int -iswupper (wint_t wc) -{ - return (wc >= 0 && wc < 128 - ? wc >= 'A' && wc <= 'Z' - : 0); -} -# define iswupper iswupper -#endif -#if !defined iswxdigit && !HAVE_ISWCNTRL -static inline int -iswxdigit (wint_t wc) -{ - return (wc >= '0' && wc <= '9') || ((wc & ~0x20) >= 'A' && (wc & ~0x20) <= 'F'); -} -# define iswxdigit iswxdigit -#endif +#include #include "wcwidth.h" diff --git a/lib/mbswidth.c b/lib/mbswidth.c index a207d0f6e..1d282b60d 100644 --- a/lib/mbswidth.c +++ b/lib/mbswidth.c @@ -45,12 +45,7 @@ #include "wcwidth.h" /* Get iswcntrl(). */ -#if HAVE_WCTYPE_H -# include -#endif -#if !defined iswcntrl && !HAVE_ISWCNTRL -# define iswcntrl(wc) (((wc) & ~0x1f) == 0 || (wc) == 0x7f) -#endif +#include #ifndef mbsinit # if !HAVE_MBSINIT diff --git a/lib/wcwidth.h b/lib/wcwidth.h index 83da8fb0f..389d810a8 100644 --- a/lib/wcwidth.h +++ b/lib/wcwidth.h @@ -32,23 +32,7 @@ # endif /* Get iswprint. */ -# if HAVE_WCTYPE_H -# include -# endif -# if !defined iswprint && !HAVE_ISWPRINT -static inline int -# if HAVE_WINT_T -iswprint (wint_t wc) -# else -iswprint (int wc) -# endif -{ - return (wc >= 0 && wc < 128 - ? wc >= ' ' && wc <= '~' - : 1); -} -# define iswprint iswprint -# endif +# include # ifndef HAVE_DECL_WCWIDTH "this configure-time declaration test was not run" diff --git a/m4/mbchar.m4 b/m4/mbchar.m4 index f95e9267c..017c56ad4 100644 --- a/m4/mbchar.m4 +++ b/m4/mbchar.m4 @@ -16,8 +16,5 @@ AC_DEFUN([gl_MBCHAR], dnl Compile mbchar.c only if HAVE_WCHAR_H. if test $ac_cv_header_wchar_h = yes; then AC_LIBOBJ([mbchar]) - dnl Prerequisites of mbchar.h and mbchar.c. - AC_CHECK_HEADERS_ONCE([wctype.h]) - AC_CHECK_FUNCS([iswcntrl]) fi ]) diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4 index 5aff74eb5..462eb0b6a 100644 --- a/m4/mbswidth.m4 +++ b/m4/mbswidth.m4 @@ -9,9 +9,8 @@ dnl From Bruno Haible. AC_DEFUN([gl_MBSWIDTH], [ - AC_CHECK_HEADERS_ONCE([wchar.h wctype.h]) + AC_CHECK_HEADERS_ONCE([wchar.h]) AC_CHECK_FUNCS_ONCE([isascii mbsinit]) - AC_CHECK_FUNCS([iswcntrl]) gl_FUNC_MBRTOWC dnl UnixWare 7.1.1 has a declaration of a function mbswidth() diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index e8a37f2e4..7f23e5fed 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -13,8 +13,8 @@ AC_DEFUN([gl_FUNC_WCWIDTH], AC_REQUIRE([gt_TYPE_WCHAR_T]) AC_REQUIRE([gt_TYPE_WINT_T]) - AC_CHECK_HEADERS_ONCE([wchar.h wctype.h]) - AC_CHECK_FUNCS_ONCE([iswprint wcwidth]) + AC_CHECK_HEADERS_ONCE([wchar.h]) + AC_CHECK_FUNCS_ONCE([wcwidth]) AC_CHECK_DECLS([wcwidth], [], [], [ /* AIX 3.2.5 declares wcwidth in . */ diff --git a/modules/mbchar b/modules/mbchar index 9b4b9414e..1d85ef769 100644 --- a/modules/mbchar +++ b/modules/mbchar @@ -8,6 +8,7 @@ m4/mbchar.m4 Depends-on: stdbool +wctype wcwidth configure.ac: @@ -25,4 +26,3 @@ LGPL Maintainer: Bruno Haible - diff --git a/modules/mbswidth b/modules/mbswidth index f4b8f7920..6b0e0b2ba 100644 --- a/modules/mbswidth +++ b/modules/mbswidth @@ -9,6 +9,7 @@ m4/mbrtowc.m4 m4/mbswidth.m4 Depends-on: +wctype wcwidth configure.ac: @@ -25,4 +26,3 @@ GPL Maintainer: Bruno Haible - diff --git a/modules/wcwidth b/modules/wcwidth index d236a4866..d10209f19 100644 --- a/modules/wcwidth +++ b/modules/wcwidth @@ -8,6 +8,7 @@ m4/wchar_t.m4 m4/wint_t.m4 Depends-on: +wctype configure.ac: gl_FUNC_WCWIDTH -- 2.11.0