chiark / gitweb /
Avoid macro-generating a trailing comma in an enum.
authorSimon Tatham <anakin@pobox.com>
Sun, 24 Sep 2017 15:56:18 +0000 (16:56 +0100)
committerSimon Tatham <anakin@pobox.com>
Sun, 24 Sep 2017 15:56:18 +0000 (16:56 +0100)
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.)

loopy.c

diff --git a/loopy.c b/loopy.c
index 7d3436aacbc5862ab2d657f93c4b0c828143e4f6..92b27ab51690f10aa89983b8af934fa591dc1449 100644 (file)
--- 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) };