* 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.

diff --git a/ChangeLog b/ChangeLog
index c7bd71fca3489120a0f5cc2faf0add6be1d8f2ba..43f901680c15325102c9887c586953ce100b9351 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 aa17f9c8f839b1e7a79b1c7b1c729c34de38f29d..312be2d0e91f6012f437e235db50d3253cd28281 100644 (file)
--- 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 c24e75f26946e3fc2ecc12f40e6884677f555476..05cd83a83d836c4df719a8842cf70c58260db018 100644 (file)
--- 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 #(