zakarya/puzzles
1
0
Fork 0
mirror of git://git.tartarus.org/simon/puzzles.git synced 2025-04-21 16:05:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

Pedantic tweaks to allow successful compilation on Windows. (gcc

Browse Source 
failed to point out a declaration after a statement, and gcc's
linker was clever enough to optimise the call to divvy_rectangle()
out of solosolver so that I didn't have to include divvy.c in that.)

[originally from svn r7975]
This commit is contained in:
Simon Tatham
2008-04-07 17:12:21 +00:00
parent 93103eeca4
commit 30da25262d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
solo.R
View File

@ -6,8 +6,8 @@ solo : [X] GTK COMMON SOLO solo-icon|no-icon
solo : [G] WINDOWS COMMON SOLO solo.res|noicon.res solo : [G] WINDOWS COMMON SOLO solo.res|noicon.res
solosolver : [U] solo[STANDALONE_SOLVER] dsf STANDALONE solosolver : [U] solo[STANDALONE_SOLVER] divvy dsf STANDALONE
solosolver : [C] solo[STANDALONE_SOLVER] dsf STANDALONE solosolver : [C] solo[STANDALONE_SOLVER] divvy dsf STANDALONE
ALL += SOLO ALL += SOLO

4
solo.c
View File

@ -2571,6 +2571,8 @@ static char *validate_desc(game_params *params, char *desc)
return "Too much data to fit in grid"; return "Too much data to fit in grid";
if (params->r == 1) { if (params->r == 1) {
int pos;
/* /*
* Now we expect a suffix giving the jigsaw block * Now we expect a suffix giving the jigsaw block
* structure. Parse it and validate that it divides the * structure. Parse it and validate that it divides the
@ -2579,7 +2581,7 @@ static char *validate_desc(game_params *params, char *desc)
*/ */
if (*desc != ',') if (*desc != ',')
return "Expected jigsaw block structure in game description"; return "Expected jigsaw block structure in game description";
int pos = 0; pos = 0;
dsf = snew_dsf(area); dsf = snew_dsf(area);
desc++; desc++;