Fix Win7 compiler errors/warnings for r9945



git-svn-id: http://skia.googlecode.com/svn/trunk@9947 2bbb7eff-a529-9590-31e7-b0007b416f81
2 files changed