APPROVE COMMIT NOTE: This patch has been committed # HG changeset patch # User Aidan Kehoe <kehoea(a)parhasard.net&gt; # Date 1508246164 -3600 # Tue Oct 17 14:16:04 2017 +0100 # Node ID 81e6fa9d46d02bedd36f321266b3f5787055e1b0 # Parent 222b2a338e9daa7f4b7c12efe00859c76058e946 Correct the definition of the STRING_FULLSIZE() macro, alloc.c, NEW_GC src/ChangeLog addition: 2017-10-17 Aidan Kehoe <kehoea(a)parhasard.net&gt; * alloc.c (STRING_FULLSIZE): Correct the definition of this macro under NEW_GC, get the NEW_GC build working again. Incidentally wake up the buildbot with this commit. diff -r 222b2a338e9d -r 81e6fa9d46d0 src/ChangeLog --- a/src/ChangeLog Fri Oct 13 21:29:51 2017 +0100 +++ b/src/ChangeLog Tue Oct 17 14:16:04 2017 +0100 ＠＠ -7,6 +7,13 ＠＠ Removed unused file-local C variables QSsubstitute, Qsubstitute_negated from these files. +2017-10-17 Aidan Kehoe <kehoea(a)parhasard.net&gt; + + * alloc.c (STRING_FULLSIZE): + Correct the definition of this macro under NEW_GC, get the NEW_GC + build working again. + Incidentally wake up the buildbot with this commit. + 2017-10-07 Aidan Kehoe <kehoea(a)parhasard.net&gt; * eval.c (Feval): diff -r 222b2a338e9d -r 81e6fa9d46d0 src/alloc.c --- a/src/alloc.c Fri Oct 13 21:29:51 2017 +0100 +++ b/src/alloc.c Tue Oct 17 14:16:04 2017 +0100 ＠＠ -2802,7 +2802,7 ＠＠ #ifdef NEW_GC #define STRING_FULLSIZE(size) \ - ALIGN_SIZE (FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_String_Direct_Data, Lisp_Object, data, (size) + 1), sizeof (Lisp_Object *)); + ALIGN_SIZE (FLEXIBLE_ARRAY_STRUCT_SIZEOF (Lisp_String_Direct_Data, Lisp_Object, data, (size) + 1), sizeof (Lisp_Object *)) #else /* not NEW_GC */ /* String blocks contain this many useful bytes. */ #define STRING_CHARS_BLOCK_SIZE \ -- ‘As I sat looking up at the Guinness ad, I could never figure out / How your man stayed up on the surfboard after forty pints of stout’ (C. Moore)