fix msvc warnings
This avoids a few compiler-warnings on MSVC.
The macro-redefinition bits can be dropped once !132 (merged) lands.
Edited by Erik Faye-Lund
This avoids a few compiler-warnings on MSVC.
The macro-redefinition bits can be dropped once !132 (merged) lands.