removed redundant embedded ifdefs
fix sign warning
Merge pull request #1547 from ZappoMan/windows_build

removed unneeded redundant #ifdefs and fixed compiler warning