aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Tatham <anakin@pobox.com>2017-09-24 16:56:18 +0100
committerSimon Tatham <anakin@pobox.com>2017-09-24 16:56:18 +0100
commitdf3b9cb845d5641dab16cbe071dca0ac2b7a97fb (patch)
tree0e474552c5443291b58375429ddad17f1251df17
parentff218728c6953ede1957ddb5b039bcb2ba920a44 (diff)
downloadpuzzles-df3b9cb845d5641dab16cbe071dca0ac2b7a97fb.zip
puzzles-df3b9cb845d5641dab16cbe071dca0ac2b7a97fb.tar.gz
puzzles-df3b9cb845d5641dab16cbe071dca0ac2b7a97fb.tar.bz2
puzzles-df3b9cb845d5641dab16cbe071dca0ac2b7a97fb.tar.xz
Avoid macro-generating a trailing comma in an enum.
gcc objects to this in -pedantic mode, which means other compilers are technically entitled to object too if they like. Usually I try to avoid it by putting a dummy value at the end of the enum, but I forgot in this case. (And I didn't notice, because _my_ local builds run without -pedantic, on the grounds that configure.ac autodetects that my system's GTK headers are not pedantic-clean. Oh well.)
-rw-r--r--loopy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/loopy.c b/loopy.c
index 7d3436a..92b27ab 100644
--- a/loopy.c
+++ b/loopy.c
@@ -288,7 +288,7 @@ static void check_caches(const solver_state* sstate);
{amin, omin, \
"Width and height for this grid type must both be at least " #amin, \
"At least one of width and height for this grid type must be at least " #omin,},
-enum { GRIDLIST(GRID_LOOPYTYPE) };
+enum { GRIDLIST(GRID_LOOPYTYPE) LOOPY_GRID_DUMMY_TERMINATOR };
static char const *const gridnames[] = { GRIDLIST(GRID_NAME) };
#define GRID_CONFIGS GRIDLIST(GRID_CONFIG)
static grid_type grid_types[] = { GRIDLIST(GRID_GRIDTYPE) };