Merge pull request #281 from sergiud/msvc-error-define