--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2006-12-27  Paul Eggert  <eggert@cs.ucla.edu>
+
+	* lib/mbchar.h: Just include <wctype.h>; 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  <ebb9@byu.net>
 
 	* lib/fnmatch.c: Reinstate inclusion of <wchar.h>, since this

--- a/lib/mbchar.h
+++ b/lib/mbchar.h
@@ -155,132 +155,7 @@
 #include <stdio.h>
 #include <time.h>
 #include <wchar.h>
-
-/* BeOS 5 has the functions but no <wctype.h>.  */
-#if HAVE_WCTYPE_H
-# include <wctype.h>
-#endif
-/* FreeBSD 4.4 to 4.11 has <wctype.h> 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 <wctype.h>
 
 #include "wcwidth.h"
 

--- a/lib/mbswidth.c
+++ b/lib/mbswidth.c
@@ -45,12 +45,7 @@
 #include "wcwidth.h"
 
 /* Get iswcntrl().  */
-#if HAVE_WCTYPE_H
-# include <wctype.h>
-#endif
-#if !defined iswcntrl && !HAVE_ISWCNTRL
-# define iswcntrl(wc) (((wc) & ~0x1f) == 0 || (wc) == 0x7f)
-#endif
+#include <wctype.h>
 
 #ifndef mbsinit
 # if !HAVE_MBSINIT

--- a/lib/wcwidth.h
+++ b/lib/wcwidth.h
@@ -32,23 +32,7 @@
 # endif
 
 /* Get iswprint.  */
-# if HAVE_WCTYPE_H
-#  include <wctype.h>
-# 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 <wctype.h>
 
 # ifndef HAVE_DECL_WCWIDTH
 "this configure-time declaration test was not run"

--- a/m4/mbchar.m4
+++ b/m4/mbchar.m4
@@ -16,8 +16,5 @@
   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
 ])

--- a/m4/mbswidth.m4
+++ b/m4/mbswidth.m4
@@ -9,9 +9,8 @@
 
 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 <wchar.h> has a declaration of a function mbswidth()

--- a/m4/wcwidth.m4
+++ b/m4/wcwidth.m4
@@ -13,8 +13,8 @@
   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 <string.h>. */

--- a/modules/mbchar
+++ b/modules/mbchar
@@ -8,6 +8,7 @@
 
 Depends-on:
 stdbool
+wctype
 wcwidth
 
 configure.ac:
@@ -25,4 +26,3 @@
 
 Maintainer:
 Bruno Haible
-

--- a/modules/mbswidth
+++ b/modules/mbswidth
@@ -9,6 +9,7 @@
 m4/mbswidth.m4
 
 Depends-on:
+wctype
 wcwidth
 
 configure.ac:
@@ -25,4 +26,3 @@
 
 Maintainer:
 Bruno Haible
-

--- a/modules/wcwidth
+++ b/modules/wcwidth
@@ -8,6 +8,7 @@
 m4/wint_t.m4
 
 Depends-on:
+wctype
 
 configure.ac:
 gl_FUNC_WCWIDTH