chiark / gitweb /
sgt-puzzles (20161228.7cae89f-1) unstable; urgency=medium
[sgt-puzzles.git] / debian / patches / fix-ftbfs-with-gcc-6.patch
1 Author: Ben Hutchings <ben@decadent.org.uk
2 Date: Thu, 30 Jun 2016 14:43:16 +0200
3 Description: Fix FTBFS with gcc 6
4  gcc 6 warns about statements that are indented as if they were meant to be
5  part of a preceding conditional block.  In this case I don't think that was
6  intended, so shift it left.
7 Bug-Debian: https://bugs.debian.org/811577
8
9 --- a/towers.c
10 +++ b/towers.c
11 @@ -388,12 +388,12 @@ static int solver_easy(struct latin_solv
12             return ret;
13  
14  #ifdef STANDALONE_SOLVER
15 -           if (solver_show_working)
16 -               sprintf(prefix, "%*slower bounds for clue %s %d:\n",
17 -                       solver_recurse_depth*4, "",
18 -                       cluepos[c/w], c%w+1);
19 -           else
20 -               prefix[0] = '\0';              /* placate optimiser */
21 +       if (solver_show_working)
22 +           sprintf(prefix, "%*slower bounds for clue %s %d:\n",
23 +                   solver_recurse_depth*4, "",
24 +                   cluepos[c/w], c%w+1);
25 +       else
26 +           prefix[0] = '\0';          /* placate optimiser */
27  #endif
28  
29         i = 0;