regex.c (byte_re_match_2_internal): Split declaration and assignment to avoid -Wc++-compat warning due to goto.
2009-09-30 Martin Thuresson <martint@google.com> * regex.c (byte_re_match_2_internal): Split declaration and assignment to avoid -Wc++-compat warning due to goto. From-SVN: r152354
This commit is contained in:
parent
f2f49be3bb
commit
4578037eb7
2 changed files with 10 additions and 2 deletions
|
@ -1,3 +1,8 @@
|
|||
2009-09-30 Martin Thuresson <martint@google.com>
|
||||
|
||||
* regex.c (byte_re_match_2_internal): Split declaration and
|
||||
assignment to avoid -Wc++-compat warning due to goto.
|
||||
|
||||
2009-09-29 Jason Merrill <jason@redhat.com>
|
||||
|
||||
* Makefile.in: Enable demangle target.
|
||||
|
|
|
@ -5910,11 +5910,14 @@ byte_re_match_2_internal (struct re_pattern_buffer *bufp,
|
|||
{
|
||||
/* 1 if this match ends in the same string (string1 or string2)
|
||||
as the best previous match. */
|
||||
boolean same_str_p = (FIRST_STRING_P (match_end)
|
||||
== MATCHING_IN_FIRST_STRING);
|
||||
boolean same_str_p;
|
||||
|
||||
/* 1 if this match is the best seen so far. */
|
||||
boolean best_match_p;
|
||||
|
||||
same_str_p = (FIRST_STRING_P (match_end)
|
||||
== MATCHING_IN_FIRST_STRING);
|
||||
|
||||
/* AIX compiler got confused when this was combined
|
||||
with the previous declaration. */
|
||||
if (same_str_p)
|
||||
|
|
Loading…
Add table
Reference in a new issue