Preprocessor code is more VisualStudio friendly

Bypassing some C89-related limitations of VS2012.