diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2023-08-12 12:50:15 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2023-08-12 12:57:35 -0700 |
| commit | f3868cb9d1806b35186eabc0262393316ebe689a (patch) | |
| tree | b94176760150b6994aacf74292a12ba0890b9222 /lib/diffseq.h | |
| parent | b66c16c789d8046ff40c48b9346b26238b1b97e1 (diff) | |
Update from Gnulib by running admin/merge-gnulib
Diffstat (limited to 'lib/diffseq.h')
| -rw-r--r-- | lib/diffseq.h | 24 |
1 files changed, 5 insertions, 19 deletions
diff --git a/lib/diffseq.h b/lib/diffseq.h index 06e1465bf1b..3f85ab2ec41 100644 --- a/lib/diffseq.h +++ b/lib/diffseq.h @@ -92,20 +92,11 @@ # define NOTE_ORDERED false #endif -/* Use this to suppress gcc's "...may be used before initialized" warnings. - Beware: The Code argument must not contain commas. */ +/* Suppress gcc's "...may be used before initialized" warnings, + generated by GCC versions up to at least GCC 13.2. */ #if __GNUC__ + (__GNUC_MINOR__ >= 7) > 4 # pragma GCC diagnostic push -#endif -#ifndef IF_LINT -# if defined GCC_LINT || defined lint -# define IF_LINT(Code) Code -# else -# define IF_LINT(Code) /* empty */ -# if __GNUC__ + (__GNUC_MINOR__ >= 7) > 4 -# pragma GCC diagnostic ignored "-Wmaybe-uninitialized" -# endif -# endif +# pragma GCC diagnostic ignored "-Wmaybe-uninitialized" #endif /* @@ -388,13 +379,8 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal, and report halfway between our best results so far. */ if (c >= ctxt->too_expensive) { - OFFSET fxybest; - OFFSET fxbest IF_LINT (= 0); - OFFSET bxybest; - OFFSET bxbest IF_LINT (= 0); - /* Find forward diagonal that maximizes X + Y. */ - fxybest = -1; + OFFSET fxybest = -1, fxbest; for (d = fmax; d >= fmin; d -= 2) { OFFSET x = MIN (fd[d], xlim); @@ -412,7 +398,7 @@ diag (OFFSET xoff, OFFSET xlim, OFFSET yoff, OFFSET ylim, bool find_minimal, } /* Find backward diagonal that minimizes X + Y. */ - bxybest = OFFSET_MAX; + OFFSET bxybest = OFFSET_MAX, bxbest; for (d = bmax; d >= bmin; d -= 2) { OFFSET x = MAX (xoff, bd[d]); |