From 4578037eb7b14062b4c1a5bafccc13893c11561c Mon Sep 17 00:00:00 2001 From: Martin Thuresson Date: Thu, 1 Oct 2009 01:20:13 +0000 Subject: [PATCH] regex.c (byte_re_match_2_internal): Split declaration and assignment to avoid -Wc++-compat warning due to goto. 2009-09-30 Martin Thuresson * regex.c (byte_re_match_2_internal): Split declaration and assignment to avoid -Wc++-compat warning due to goto. From-SVN: r152354 --- libiberty/ChangeLog | 5 +++++ libiberty/regex.c | 7 +++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog index 03a84798d30..1b3a44c4a2e 100644 --- a/libiberty/ChangeLog +++ b/libiberty/ChangeLog @@ -1,3 +1,8 @@ +2009-09-30 Martin Thuresson + + * regex.c (byte_re_match_2_internal): Split declaration and + assignment to avoid -Wc++-compat warning due to goto. + 2009-09-29 Jason Merrill * Makefile.in: Enable demangle target. diff --git a/libiberty/regex.c b/libiberty/regex.c index fa1df197ce9..ad496846904 100644 --- a/libiberty/regex.c +++ b/libiberty/regex.c @@ -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)