Mercurial > hg > octave-nkf > gnulib-hg
diff lib/regcomp.c @ 5972:aa260da0bbbe
* config/srclist.txt: Comment out regcomp.c, since we have a porting fix
now.
* lib/regcomp.c (init_dfa, build_range_exp): Store __btowc value
in wint_t, not wchar_t. Remove now-unnecessary cast.
| author | Paul Eggert <eggert@cs.ucla.edu> |
|---|---|
| date | Fri, 08 Jul 2005 17:57:01 +0000 |
| parents | 541fed6ae301 |
| children | c1760162e42f |
line wrap: on
line diff
--- a/lib/regcomp.c +++ b/lib/regcomp.c @@ -917,11 +917,11 @@ for (i = 0, ch = 0; i < BITSET_UINTS; ++i) for (j = 0; j < UINT_BITS; ++j, ++ch) { - wchar_t wch = __btowc (ch); + wint_t wch = __btowc (ch); if (wch != WEOF) dfa->sb_char[i] |= 1 << j; # ifndef _LIBC - if (isascii (ch) && wch != (wchar_t) ch) + if (isascii (ch) && wch != ch) dfa->map_notascii = 1; # endif } @@ -2682,7 +2682,8 @@ # ifdef RE_ENABLE_I18N { - wchar_t wc, start_wc, end_wc; + wchar_t wc; + wint_t start_wc, end_wc; wchar_t cmp_buf[6] = {L'\0', L'\0', L'\0', L'\0', L'\0', L'\0'}; start_ch = ((start_elem->type == SB_CHAR) ? start_elem->opr.ch