chh accepted this revision. chh added a comment. This revision is now accepted and ready to land. I don't know if the WIN32 definitions are correct or not. The non-WIN32 change looked good and compatible with current definitions. https://reviews.llvm.org/D30787