diff options
| author | Eric Blake <ebb9@byu.net> | 2007-01-10 18:25:49 +0000 |
|---|---|---|
| committer | Eric Blake <ebb9@byu.net> | 2007-01-10 18:25:49 +0000 |
| commit | 0191a7041eba6c7f9190e56dea2430ded092fc68 (patch) | |
| tree | 5bc3402b91f1b5a177fe9eae391ad5c2232e9aa1 | |
| parent | e53c1581fd10184ac3af5e4fa5ac315a75e3b211 (diff) | |
| download | gnulib-0191a7041eba6c7f9190e56dea2430ded092fc68.tar.gz | |
* lib/wctype_.h [HAVE_WINT_T]: Rely on AC_DEFINE.
* m4/wctype.m4 (gl_WCTYPE_H): No need to AC_SUBST(HAVE_WINT_T).
* modules/wctype (Makefile.am): Likewise.
Reported by Chris McGuire.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/wctype_.h | 2 | ||||
| -rw-r--r-- | m4/wctype.m4 | 3 | ||||
| -rw-r--r-- | modules/wctype | 1 |
4 files changed, 10 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2007-01-10 Eric Blake <ebb9@byu.net> + + * lib/wctype_.h [HAVE_WINT_T]: Rely on AC_DEFINE. + * m4/wctype.m4 (gl_WCTYPE_H): No need to AC_SUBST(HAVE_WINT_T). + * modules/wctype (Makefile.am): Likewise. + Reported by Chris McGuire. + 2007-01-10 Jim Meyering <jim@meyering.net> fts.c: a small readability/maintainability improvement diff --git a/lib/wctype_.h b/lib/wctype_.h index 6a3c05653c..3cd3c8750d 100644 --- a/lib/wctype_.h +++ b/lib/wctype_.h @@ -29,7 +29,7 @@ #ifndef _GL_WCTYPE_H #define _GL_WCTYPE_H -#if @HAVE_WINT_T@ - 0 +#if HAVE_WINT_T - 0 /* Solaris 2.5 has a bug: <wchar.h> must be included before <wctype.h>. Tru64 with Desktop Toolkit C has a bug: <stdio.h> must be included before <wchar.h>. diff --git a/m4/wctype.m4 b/m4/wctype.m4 index 9d5fe3ff96..001d54edb1 100644 --- a/m4/wctype.m4 +++ b/m4/wctype.m4 @@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Paul Eggert. +# wctype.m4 serial 2 + AC_DEFUN([gl_WCTYPE_H], [ AC_CHECK_FUNCS_ONCE([iswcntrl]) @@ -14,7 +16,6 @@ AC_DEFUN([gl_WCTYPE_H], AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([gt_TYPE_WINT_T]) - AC_SUBST([HAVE_WINT_T]) WCTYPE_H=wctype.h if test $ac_cv_header_wctype_h = yes; then diff --git a/modules/wctype b/modules/wctype index a6fd3467e9..e514a2d9aa 100644 --- a/modules/wctype +++ b/modules/wctype @@ -23,7 +23,6 @@ wctype.h: wctype_.h sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \ -e 's|@''ABSOLUTE_WCTYPE_H''@|$(ABSOLUTE_WCTYPE_H)|g' \ -e 's/@''HAVE_WCTYPE_CTMP_BUG''@/$(HAVE_WCTYPE_CTMP_BUG)/g' \ - -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \ < $(srcdir)/wctype_.h; \ } > $@-t mv $@-t $@ |