More ifdef's for WIN32

This should keep OS X from reporting conflicting types.