Mercurial > gnulib
changeset 10953:402b52de2fa2
Merge branch 'master' of ssh://haible@git.sv.gnu.org/srv/git/gnulib
| author | Bruno Haible <bruno@clisp.org> |
|---|---|
| date | Mon, 22 Dec 2008 11:34:14 +0100 |
| parents | 961aa3e904c1 (current diff) 43dfcdcad689 (diff) |
| children | a0bbe1a6f787 |
| files | ChangeLog |
| diffstat | 4 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Dec 22 11:33:52 2008 +0100 +++ b/ChangeLog Mon Dec 22 11:34:14 2008 +0100 @@ -2,6 +2,12 @@ * doc/posix-functions/mbtowc.texi: Mention a glibc bug. +2008-12-22 Paolo Bonzini <bonzini@gnu.org> + + * modules/regex: Request emulations for the mb*/wc* functions we need. + * m4/regex.m4: Don't look for those functions here. + * lib/regex_internal.h: Do not check HAVE_WCRTOMB and HAVE_MBRTOWC. + 2008-12-22 Bruno Haible <bruno@clisp.org> * modules/fnmatch (Depends-on): Remove duplicated dependency.
--- a/lib/regex_internal.h Mon Dec 22 11:33:52 2008 +0100 +++ b/lib/regex_internal.h Mon Dec 22 11:34:14 2008 +0100 @@ -84,7 +84,7 @@ # define SIZE_MAX ((size_t) -1) #endif -#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC +#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC # define RE_ENABLE_I18N #endif
--- a/m4/regex.m4 Mon Dec 22 11:33:52 2008 +0100 +++ b/m4/regex.m4 Mon Dec 22 11:34:14 2008 +0100 @@ -219,6 +219,6 @@ AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([AC_TYPE_MBSTATE_T]) AC_CHECK_HEADERS([libintl.h]) - AC_CHECK_FUNCS_ONCE([isblank iswctype mbrtowc wcrtomb wcscoll]) + AC_CHECK_FUNCS_ONCE([isblank iswctype wcscoll]) AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>]) ])