merge 10.0-base ->10.0

This commit is contained in:
unknown 2014-02-05 20:35:11 +02:00
commit 52311b72e6
174 changed files with 12296 additions and 6830 deletions

View file

@ -8584,7 +8584,7 @@ char *re_eprint(int err)
{
static char epbuf[100];
size_t len __attribute__((unused))=
regerror(REG_ITOA|err, (regex_t *)NULL, epbuf, sizeof(epbuf));
regerror(err, (regex_t *)NULL, epbuf, sizeof(epbuf));
assert(len <= sizeof(epbuf));
return(epbuf);
}