Cleanup cppcheck (part 1)
WIN32 -> _WIN32
Cleanup cppcheck (part 2)
Merge pull request #26 from pavel-pimenov/master

Cleanup cppcheck