Add missing defines for windows

Merged Gijs Peskens requested to merge msvc into master

Merge request reports