From: Ivailo Monev <xakepa10@laimg.moc>
Date: Sat, 28 Dec 2019 02:29:48 +0000 (+0000)
Subject: remove redundant QT_SOCKOPTLEN_T definition
X-Git-Tag: 4.12.0~4503
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=4dc4a74fe5e77b1621c57bfc97909f02b5751cb0;p=kde%2FKatie.git

remove redundant QT_SOCKOPTLEN_T definition

Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
---

diff --git a/src/network/socket/qnativesocketengine_unix.cpp b/src/network/socket/qnativesocketengine_unix.cpp
index 51eae83bf..a7e22d7a0 100644
--- a/src/network/socket/qnativesocketengine_unix.cpp
+++ b/src/network/socket/qnativesocketengine_unix.cpp
@@ -245,7 +245,7 @@ int QNativeSocketEnginePrivate::option(QNativeSocketEngine::SocketOption opt) co
     }
 
     int v = -1;
-    QT_SOCKOPTLEN_T len = sizeof(v);
+    QT_SOCKLEN_T len = sizeof(v);
     if (::getsockopt(socketDescriptor, level, n, (char *) &v, &len) != -1)
         return v;
 
@@ -676,7 +676,7 @@ QNetworkInterface QNativeSocketEnginePrivate::nativeMulticastInterface() const
 #ifndef QT_NO_IPV6
     if (socketProtocol == QAbstractSocket::IPv6Protocol) {
         uint v;
-        QT_SOCKOPTLEN_T sizeofv = sizeof(v);
+        QT_SOCKLEN_T sizeofv = sizeof(v);
         if (::getsockopt(socketDescriptor, IPPROTO_IPV6, IPV6_MULTICAST_IF, &v, &sizeofv) == -1)
             return QNetworkInterface();
         return QNetworkInterface::interfaceFromIndex(v);
@@ -684,7 +684,7 @@ QNetworkInterface QNativeSocketEnginePrivate::nativeMulticastInterface() const
 #endif
 
     struct in_addr v = { 0 };
-    QT_SOCKOPTLEN_T sizeofv = sizeof(v);
+    QT_SOCKLEN_T sizeofv = sizeof(v);
     if (::getsockopt(socketDescriptor, IPPROTO_IP, IP_MULTICAST_IF, &v, &sizeofv) == -1)
         return QNetworkInterface();
     if (v.s_addr != 0 && sizeofv >= sizeof(v)) {
@@ -934,7 +934,7 @@ bool QNativeSocketEnginePrivate::fetchConnectionParameters()
 
     // Determine the socket type (UDP/TCP)
     int value = 0;
-    QT_SOCKOPTLEN_T valueSize = sizeof(int);
+    QT_SOCKLEN_T valueSize = sizeof(int);
     if (::getsockopt(socketDescriptor, SOL_SOCKET, SO_TYPE, &value, &valueSize) == 0) {
         if (value == SOCK_STREAM)
             socketType = QAbstractSocket::TcpSocket;
diff --git a/src/network/socket/qnet_unix_p.h b/src/network/socket/qnet_unix_p.h
index fb929cc76..e9573302c 100644
--- a/src/network/socket/qnet_unix_p.h
+++ b/src/network/socket/qnet_unix_p.h
@@ -57,11 +57,6 @@
 
 QT_BEGIN_NAMESPACE
 
-// Almost always the same. If not, specify in qplatformdefs.h.
-#if !defined(QT_SOCKOPTLEN_T)
-# define QT_SOCKOPTLEN_T QT_SOCKLEN_T
-#endif
-
 // UnixWare 7 redefines socket -> _socket
 static inline int qt_safe_socket(int domain, int type, int protocol, int flags = 0)
 {