Mercurial > hg > octave-lojdl > gnulib-hg
changeset 7854:06a39aa1ac48
* 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.
| author | Eric Blake <ebb9@byu.net> |
|---|---|
| date | Wed, 10 Jan 2007 18:25:49 +0000 |
| parents | 9ddbddb3fc43 |
| children | 5676e78ccca5 |
| files | ChangeLog lib/wctype_.h m4/wctype.m4 modules/wctype |
| diffstat | 4 files changed, 10 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -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
--- 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>.
--- a/m4/wctype.m4 +++ b/m4/wctype.m4 @@ -7,6 +7,8 @@ dnl Written by Paul Eggert. +# wctype.m4 serial 2 + AC_DEFUN([gl_WCTYPE_H], [ AC_CHECK_FUNCS_ONCE([iswcntrl]) @@ -14,7 +16,6 @@ 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
--- a/modules/wctype +++ b/modules/wctype @@ -23,7 +23,6 @@ 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 $@