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]

diff --git a/solo.R b/solo.R
index 31d767e9ecff753557059e959acf21f62eca36a5..594e014c701ebfc83ae758518f94550dd3839c3e 100644 (file)
--- a/solo.R
+++ b/solo.R
@@ -6,8 +6,8 @@ solo     : [X] GTK COMMON SOLO solo-icon|no-icon
 
 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
 

diff --git a/solo.c b/solo.c
index e9f1804555819bb6a350ddcd963c0613dc1454f7..bac51aabdd1c0467d6a516e13dad7fb3750b7e9b 100644 (file)
--- a/solo.c
+++ b/solo.c
@@ -2571,6 +2571,8 @@ static char *validate_desc(game_params *params, char *desc)
         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 @@ static char *validate_desc(game_params *params, char *desc)
         */
        if (*desc != ',')
            return "Expected jigsaw block structure in game description";
-       int pos = 0;
+       pos = 0;
 
        dsf = snew_dsf(area);
        desc++;