diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-07-14 17:41:05 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2016-08-04 12:37:36 +0000 |
| commit | 399c965b6064c440ddcf4015f5f8e9d131c7a0a6 (patch) | |
| tree | 6b06b60ff365abef0e13b3503d593a0df48d20e8 /chromium/net/socket/socket_descriptor.cc | |
| parent | 7366110654eec46f21b6824f302356426f48cd74 (diff) | |
| download | qtwebengine-chromium-399c965b6064c440ddcf4015f5f8e9d131c7a0a6.tar.gz | |
BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1
Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
Diffstat (limited to 'chromium/net/socket/socket_descriptor.cc')
| -rw-r--r-- | chromium/net/socket/socket_descriptor.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/chromium/net/socket/socket_descriptor.cc b/chromium/net/socket/socket_descriptor.cc index 0822d2d9983..b10f2dcb41d 100644 --- a/chromium/net/socket/socket_descriptor.cc +++ b/chromium/net/socket/socket_descriptor.cc @@ -11,7 +11,6 @@ #if defined(OS_WIN) #include <ws2tcpip.h> -#include "base/win/windows_version.h" #include "net/base/winsock_init.h" #endif @@ -22,8 +21,7 @@ SocketDescriptor CreatePlatformSocket(int family, int type, int protocol) { EnsureWinsockInit(); SocketDescriptor result = ::WSASocket(family, type, protocol, nullptr, 0, WSA_FLAG_OVERLAPPED); - if (result != kInvalidSocket && family == AF_INET6 && - base::win::OSInfo::GetInstance()->version() >= base::win::VERSION_VISTA) { + if (result != kInvalidSocket && family == AF_INET6) { DWORD value = 0; if (setsockopt(result, IPPROTO_IPV6, IPV6_V6ONLY, reinterpret_cast<const char*>(&value), sizeof(value))) { |