From aec89f84803823803fc8bd1fbc692588af7ef8cd Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Thu, 4 Jan 2007 19:21:42 +0000 Subject: [PATCH] * lib/wctype_.h (_ctmp_) [HAVE_WCTYPE_CTMP_BUG]: Now of type wchar_t, not wint_t. Also, include , to fix another IRIX bug. * m4/wctype.m4 (gl_WCTYPE_H): Likewise. Problems reported by Georg Schwarz for IRIX 5.3. --- ChangeLog | 5 +++++ lib/wctype_.h | 7 ++++--- m4/wctype.m4 | 3 ++- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c7bd71fca3..43f901680c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2007-01-04 Paul Eggert + * lib/wctype_.h (_ctmp_) [HAVE_WCTYPE_CTMP_BUG]: Now of type wchar_t, + not wint_t. Also, include , to fix another IRIX bug. + * m4/wctype.m4 (gl_WCTYPE_H): Likewise. + Problems reported by Georg Schwarz for IRIX 5.3. + * gnulib-tool (autoconf_minversion): Take the maximum version number found, not the minimum. Problem reported by James Youngman. diff --git a/lib/wctype_.h b/lib/wctype_.h index aa17f9c8f8..312be2d0e9 100644 --- a/lib/wctype_.h +++ b/lib/wctype_.h @@ -49,10 +49,11 @@ typedef int __wctype_wint_t; # include @ABSOLUTE_WCTYPE_H@ #endif -/* IRIX 5.3 has a bug: its isw* macros reference an undefined variable - _ctmp_. */ +/* IRIX 5.3 has bugs: its isw* macros refer to an undefined variable + _ctmp_ and to macros like _P. */ #if @HAVE_WCTYPE_CTMP_BUG@ -static wint_t _ctmp_; +# include +wchar_t _ctmp_; #endif /* FreeBSD 4.4 to 4.11 has but lacks the functions. diff --git a/m4/wctype.m4 b/m4/wctype.m4 index c24e75f269..05cd83a83d 100644 --- a/m4/wctype.m4 +++ b/m4/wctype.m4 @@ -44,7 +44,8 @@ AC_DEFUN([gl_WCTYPE_H], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [[#include - static wint_t _ctmp_;]], + #include + wchar_t _ctmp_;]], [[return iswprint (0);]])], [gl_cv_wctype_ctmp_bug=yes])])]) case $gl_cv_wctype_ctmp_bug,$ac_cv_func_iswcntrl in #( -- 2.30.2