Mercurial > hg > octave-nkf > gnulib-hg
changeset 7709:47b81ff5eb33
* lib/fnmatch.c (WIDE_CHAR_SUPPORT): Require HAVE_ISWCTYPE, too.
* lib/regex_internal.h (RE_ENABLE_I18N): Likewise.
* m4/fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Check for iswctype, too.
* m4/regex.m4 (gl_PREREQ_REGEX): Likewise.
author | Paul Eggert <eggert@cs.ucla.edu> |
---|---|
date | Mon, 04 Dec 2006 06:41:56 +0000 |
parents | 83d73ca5391c |
children | b78602e93aef |
files | ChangeLog lib/fnmatch.c lib/regex_internal.h m4/fnmatch.m4 m4/regex.m4 |
diffstat | 5 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2006-12-03 Paul Eggert <eggert@cs.ucla.edu> + + * lib/fnmatch.c (WIDE_CHAR_SUPPORT): Require HAVE_ISWCTYPE, too. + * lib/regex_internal.h (RE_ENABLE_I18N): Likewise. + * m4/fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Check for iswctype, too. + * m4/regex.m4 (gl_PREREQ_REGEX): Likewise. + 2006-12-03 Jim Meyering <jim@meyering.net> * lib/fts.c (fts_load): Don't set sp->fts_dev here, since
--- a/lib/fnmatch.c +++ b/lib/fnmatch.c @@ -40,7 +40,7 @@ #include <string.h> #define WIDE_CHAR_SUPPORT \ - (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC \ + (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && HAVE_ISWCTYPE \ && HAVE_WMEMCHR && (HAVE_WMEMCPY || HAVE_WMEMPCPY)) /* For platform which support the ISO C amendement 1 functionality we
--- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -89,7 +89,7 @@ # define SIZE_MAX ((size_t) -1) #endif -#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC +#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_ISWCTYPE && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC # define RE_ENABLE_I18N #endif
--- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -64,7 +64,7 @@ [AC_REQUIRE([AC_FUNC_ALLOCA])dnl AC_REQUIRE([AC_TYPE_MBSTATE_T])dnl AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>]) -AC_CHECK_FUNCS([btowc mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy]) +AC_CHECK_FUNCS([btowc iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy]) AC_CHECK_HEADERS([wchar.h wctype.h]) AC_LIBOBJ([fnmatch]) FNMATCH_H=fnmatch.h
--- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -#serial 40 +#serial 41 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, # 2006 Free Software Foundation, Inc. @@ -194,6 +194,6 @@ AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([AM_LANGINFO_CODESET]) AC_CHECK_HEADERS_ONCE([wchar.h wctype.h]) - AC_CHECK_FUNCS_ONCE([mbrtowc mempcpy wcrtomb wcscoll]) + AC_CHECK_FUNCS_ONCE([iswctype mbrtowc mempcpy wcrtomb wcscoll]) AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>]) ])