fixed msvc not expanding macros correctly
Merge pull request #641 from debris/msvc_compile_errors

fixed msvc not expanding macros correctly