am 940632f1: Merge "Remove references to __CYGWIN__ and HAVE_WINSOCK2_H."

* commit '940632f1a1af056ea8f87d2fa7a0c7e22cd1556b':
  Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.