fixup DIAG_{ON,OFF} to get rid of compiler errors
about not using #pragmas inside functions
Merge pull request #270 from mcnewton/master

Loosen off slightly on the warning suppression so it will compile