Add changes required to compile with MS VC6#43

pjohnmeyer merged 3 commits intounittest-cpp:masterunittest-cpp/unittest-cpp:masterfrom

martinmoene:masterCopy head branch name to clipboard