am 42f11922: Merge "Pull in Windows compatibility header."

* commit '42f1192273f3d05531c3fcfc8ce0fe5c437f6b7f':
  Pull in Windows compatibility header.