win compatibility

mostly handled w/ defines for now
Merge branch '1.1_demand_zone' into 1.1_portability