Merge "Use _WIN32 rather than HAVE_WINSOCK."