I don't know if the current form is harmless or not, but it is
definitely incorrect.  The patch below corrects the compile failure, as
well as the multi-statement macro defines used in bare if statements;
please apply.