am 1341e88c: am 524a7e46: Merge "Remove HAVE_WINSOCK."

* commit '1341e88c575a87bf1f4a05871fed78fad0fbe797':
  Remove HAVE_WINSOCK.