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

* commit 'ae25aed3c9322b7b9a054f1d1308174a6f8db2e2':
  Remove references to __CYGWIN__ and HAVE_WINSOCK2_H.