PROTON-686, PROTON-???: Fix recent changes to compile on windows

git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/trunk@1625220 13f79535-47bb-0310-9956-ffa450edef68