some more little fixes for w32, a define clash in fontview.c
Merge pull request #837 from monkeyiq/2013sep/winbuildagain2

some more little fixes for w32, a define clash in fontview.c