2002-12-14 Jakub Jelinek <jakub@redhat.com>

* posix/regex_internal.c (re_string_context_at): Guard wide char
	code with #ifdef RE_ENABLE_I18N.
This commit is contained in:
Roland McGrath 2002-12-13 23:45:19 +00:00
parent 3b7c07d8f2
commit a075623112
1 changed files with 10 additions and 8 deletions

View File

@ -562,14 +562,8 @@ re_string_context_at (input, idx, eflags, newline_anchor)
return ((eflags & REG_NOTEOL) ? CONTEXT_ENDBUF
: CONTEXT_NEWLINE | CONTEXT_ENDBUF);
}
if (MB_CUR_MAX == 1)
{
c = re_string_byte_at (input, idx);
if (IS_WORD_CHAR (c))
return CONTEXT_WORD;
return (newline_anchor && IS_NEWLINE (c)) ? CONTEXT_NEWLINE : 0;
}
else
#ifdef RE_ENABLE_I18N
if (MB_CUR_MAX > 1)
{
wint_t wc;
int wc_idx = idx;
@ -588,6 +582,14 @@ re_string_context_at (input, idx, eflags, newline_anchor)
return CONTEXT_WORD;
return (newline_anchor && IS_WIDE_NEWLINE (wc)) ? CONTEXT_NEWLINE : 0;
}
else
#endif
{
c = re_string_byte_at (input, idx);
if (IS_WORD_CHAR (c))
return CONTEXT_WORD;
return (newline_anchor && IS_NEWLINE (c)) ? CONTEXT_NEWLINE : 0;
}
}
/* Functions for set operation. */