added windows macro again
fixed .- deprecation warning