diff options
| author | Edward Welbourne <edward.welbourne@qt.io> | 2017-02-20 11:18:29 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2017-02-21 13:40:21 +0000 |
| commit | d3454299673cae44fec8eecf2cf00a4f15ebb226 (patch) | |
| tree | cb740dc7767f96bce196aed163e6f8fa4d9047c4 /src/network/socket/qnativesocketengine_win.cpp | |
| parent | 538b9f504c0de11c473a40aed66df9900ac1c6c4 (diff) | |
Join two else/if lines that were left split
Probably after-effects of some #if-ery we removed long ago ...
Change-Id: I8bf7a97dc5fda615bf20c37ccd9c1de0ba9194e5
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Diffstat (limited to 'src/network/socket/qnativesocketengine_win.cpp')
| -rw-r--r-- | src/network/socket/qnativesocketengine_win.cpp | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/network/socket/qnativesocketengine_win.cpp b/src/network/socket/qnativesocketengine_win.cpp index 80147b47ba..9e43265e59 100644 --- a/src/network/socket/qnativesocketengine_win.cpp +++ b/src/network/socket/qnativesocketengine_win.cpp @@ -943,9 +943,7 @@ static bool multicastMembershipHelper(QNativeSocketEnginePrivate *d, Q_IPV6ADDR ip6 = groupAddress.toIPv6Address(); memcpy(&mreq6.ipv6mr_multiaddr, &ip6, sizeof(ip6)); mreq6.ipv6mr_interface = iface.index(); - } else - - if (groupAddress.protocol() == QAbstractSocket::IPv4Protocol) { + } else if (groupAddress.protocol() == QAbstractSocket::IPv4Protocol) { level = IPPROTO_IP; sockOpt = how4; sockArg = reinterpret_cast<char *>(&mreq4); |