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
Due to an influx of spam, we have had to impose restrictions on new accounts. Please see this wiki page for instructions on how to get full permissions. Sorry for the inconvenience.
This avoids a few compiler-warnings on MSVC.
The macro-redefinition bits can be dropped once !132 (merged) lands.