Fix up (some of the) windows compilation issues during merge of 1032b to main

git-svn-id: file:///svn/toku/tokudb@8688 c7de825b-a66e-492c-adef-691d508d4ae1