Merge pull request #634 from csware/fix-win64-build WIN32 is not always defined, use GIT_WIN32 instead