merge from gcc
This commit is contained in:
parent
8ce8e6c107
commit
a9022147a2
2 changed files with 8 additions and 2 deletions
|
@ -1,3 +1,9 @@
|
|||
2001-08-12 Isamu Hasegawa <isamu@yamato.ibm.com>
|
||||
|
||||
* regex.c (wcs_regex_compile): Use appropriate string
|
||||
to compare with collating element.
|
||||
Fix the padding for the alignment.
|
||||
|
||||
2001-06-13 Andrew Cagney <ac131313@redhat.com>
|
||||
|
||||
* lbasename.c (lbasename): Change function definition to return a
|
||||
|
|
|
@ -3059,7 +3059,7 @@ PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp)
|
|||
/* First compare the hashing value. */
|
||||
if (symb_table[2 * elem] == hash
|
||||
&& c1 == extra[symb_table[2 * elem + 1]]
|
||||
&& memcmp (str,
|
||||
&& memcmp (char_str,
|
||||
&extra[symb_table[2 * elem + 1]
|
||||
+ 1], c1) == 0)
|
||||
{
|
||||
|
@ -3079,7 +3079,7 @@ PREFIX(regex_compile) (ARG_PREFIX(pattern), ARG_PREFIX(size), syntax, bufp)
|
|||
in the table. */
|
||||
idx += 1 + extra[idx];
|
||||
/* Adjust for the alignment. */
|
||||
idx = (idx + 3) & ~4;
|
||||
idx = (idx + 3) & ~3;
|
||||
|
||||
str[0] = (wchar_t) idx + 4;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue