From a1663d6650053eee5e43a1267a05578a920521da Mon Sep 17 00:00:00 2001 From: Simon Tatham Date: Wed, 25 Apr 2018 19:24:06 +0100 Subject: [PATCH] C89 build fixes. Recent changes introduced a couple of non-C89-compatible mixed declarations and code. --- filling.c | 6 +++--- unequal.c | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/filling.c b/filling.c index db6f95d..37090a0 100644 --- 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) { - key_label *keys = snewn(11, key_label); - *nkeys = 11; - int i; + key_label *keys = snewn(11, key_label); + + *nkeys = 11; for(i = 0; i < 10; ++i) { diff --git a/unequal.c b/unequal.c index dd7656e..592c0be 100644 --- 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;