diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2007-01-04 19:21:42 +0000 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2007-01-04 19:21:42 +0000 |
| commit | aec89f84803823803fc8bd1fbc692588af7ef8cd (patch) | |
| tree | 3d45ae9fa737b321e70660417a199e013d4870fe | |
| parent | 0794207582b9f263f4eb2f0819bbb0ec4397a760 (diff) | |
| download | gnulib-aec89f84803823803fc8bd1fbc692588af7ef8cd.tar.gz | |
* lib/wctype_.h (_ctmp_) [HAVE_WCTYPE_CTMP_BUG]: Now of type wchar_t,
not wint_t. Also, include <ctype.h>, to fix another IRIX bug.
* m4/wctype.m4 (gl_WCTYPE_H): Likewise.
Problems reported by Georg Schwarz for IRIX 5.3.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/wctype_.h | 7 | ||||
| -rw-r--r-- | m4/wctype.m4 | 3 |
3 files changed, 11 insertions, 4 deletions
@@ -1,5 +1,10 @@ 2007-01-04 Paul Eggert <eggert@cs.ucla.edu> + * lib/wctype_.h (_ctmp_) [HAVE_WCTYPE_CTMP_BUG]: Now of type wchar_t, + not wint_t. Also, include <ctype.h>, 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 <ctype.h> macros like _P. */ #if @HAVE_WCTYPE_CTMP_BUG@ -static wint_t _ctmp_; +# include <ctype.h> +wchar_t _ctmp_; #endif /* FreeBSD 4.4 to 4.11 has <wctype.h> 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 <wctype.h> - static wint_t _ctmp_;]], + #include <ctype.h> + wchar_t _ctmp_;]], [[return iswprint (0);]])], [gl_cv_wctype_ctmp_bug=yes])])]) case $gl_cv_wctype_ctmp_bug,$ac_cv_func_iswcntrl in #( |