| Index: net/socket/socket_descriptor.cc
|
| diff --git a/net/socket/socket_descriptor.cc b/net/socket/socket_descriptor.cc
|
| index 81787a29d259feb645bfd53978cd33e71fadfd7c..51ccdf169850a7bead80cdf860b404a02b4a323d 100644
|
| --- a/net/socket/socket_descriptor.cc
|
| +++ b/net/socket/socket_descriptor.cc
|
| @@ -34,19 +34,22 @@ void PlatformSocketFactory::SetInstance(PlatformSocketFactory* factory) {
|
| SocketDescriptor CreateSocketDefault(int family, int type, int protocol) {
|
| #if defined(OS_WIN)
|
| EnsureWinsockInit();
|
| - SocketDescriptor result = ::WSASocket(family, type, protocol, NULL, 0,
|
| - WSA_FLAG_OVERLAPPED);
|
| + SocketDescriptor result =
|
| + ::WSASocket(family, type, protocol, NULL, 0, WSA_FLAG_OVERLAPPED);
|
| if (result != kInvalidSocket && family == AF_INET6 &&
|
| base::win::OSInfo::GetInstance()->version() >= base::win::VERSION_VISTA) {
|
| DWORD value = 0;
|
| - if (setsockopt(result, IPPROTO_IPV6, IPV6_V6ONLY,
|
| - reinterpret_cast<const char*>(&value), sizeof(value))) {
|
| + if (setsockopt(result,
|
| + IPPROTO_IPV6,
|
| + IPV6_V6ONLY,
|
| + reinterpret_cast<const char*>(&value),
|
| + sizeof(value))) {
|
| closesocket(result);
|
| return kInvalidSocket;
|
| }
|
| }
|
| return result;
|
| -#else // OS_WIN
|
| +#else // OS_WIN
|
| return ::socket(family, type, protocol);
|
| #endif // OS_WIN
|
| }
|
|
|