Mercurial > hg > octave-nkf > gnulib-hg
changeset 10952:43dfcdcad689
update regex to use the emulated mb*/wc* functions
* 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.
| author | Paolo Bonzini <bonzini@gnu.org> |
|---|---|
| date | Mon, 22 Dec 2008 10:59:46 +0100 |
| parents | 003490fec365 |
| children | 402b52de2fa2 |
| files | ChangeLog lib/regex_internal.h m4/regex.m4 modules/regex |
| diffstat | 4 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +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 +++ b/lib/regex_internal.h @@ -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 +++ b/m4/regex.m4 @@ -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>]) ])