shithub: puzzles

Info  •  Files  •  Log  •  Branches

Pedantic tweaks to allow successful compilation on Windows. (gcc
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]

--- a/solo.R

+++ b/solo.R

@@ -6,8 +6,8 @@

 solo     : [G] WINDOWS COMMON SOLO solo.res|noicon.res

-solosolver :    [U] solo[STANDALONE_SOLVER] dsf STANDALONE

-solosolver :    [C] solo[STANDALONE_SOLVER] dsf STANDALONE

+solosolver :    [U] solo[STANDALONE_SOLVER] divvy dsf STANDALONE

+solosolver :    [C] solo[STANDALONE_SOLVER] divvy dsf STANDALONE

 ALL += SOLO

--- a/solo.c

+++ b/solo.c

@@ -2571,6 +2571,8 @@

         return "Too much data to fit in grid";

     if (params->r == 1) {

+	int pos;

+

 	/*

 	 * Now we expect a suffix giving the jigsaw block

 	 * structure. Parse it and validate that it divides the

@@ -2579,7 +2581,7 @@

 	 */

 	if (*desc != ',')

 	    return "Expected jigsaw block structure in game description";

-	int pos = 0;

+	pos = 0;

 	dsf = snew_dsf(area);

 	desc++;