am 524a7e46: Merge "Remove HAVE_WINSOCK."

* commit '524a7e46937c59cfb34289819fd3ac117911cd8d':
  Remove HAVE_WINSOCK.