C89 build fixes.

Recent changes introduced a couple of non-C89-compatible mixed
declarations and code.

diff --git a/filling.c b/filling.c
index db6f95d26f8b577d9f41dd2f1ca3d35779584833..37090a0c7ab0a3c85574de8300f28b7892fb80f5 100644 (file)
--- a/filling.c
+++ b/filling.c
@@ -1289,10 +1289,10 @@ static const char *validate_desc(const game_params *params, const char *desc)
 
 static key_label *game_request_keys(const game_params *params, int *nkeys)
 {
+    int i;
     key_label *keys = snewn(11, key_label);
-    *nkeys = 11;
 
-    int i;
+    *nkeys = 11;
 
     for(i = 0; i < 10; ++i)
     {

diff --git a/unequal.c b/unequal.c
index dd7656ed9ede0e64bb6a867b04b7ee3e7db059ef..592c0be0850ede2e29d364ab00b29a6d6d750328 100644 (file)
--- a/unequal.c
+++ b/unequal.c
@@ -1282,12 +1282,12 @@ fail:
 
 static key_label *game_request_keys(const game_params *params, int *nkeys)
 {
+    int i;
     int order = params->order;
     char off = (order > 9) ? '0' : '1';
     key_label *keys = snewn(order + 1, key_label);
     *nkeys = order + 1;
 
-    int i;
     for(i = 0; i < order; i++) {
         if (i==10) off = 'a'-10;
         keys[i].button = i + off;