fixed if/else block blocking build using single lines with macros to use braces
fixed if/else block blocking build using single lines with macros to use braces

Builds.  Runtime untested.

DrPaulBrewer/multicoresql,DrPaulBrewer/multicoresql