diff --git a/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp b/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp index 5f12222f2..a4ac293cd 100644 --- a/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp +++ b/local/recipes/qt/qtbase/source/src/network/socket/qnativesocketengine_unix.cpp @@ -148,9 +148,7 @@ static void convertToLevelAndOption(QNativeSocketEngine::SocketOption opt, case QNativeSocketEngine::ReceiveHopLimit: if (socketProtocol == QAbstractSocket::IPv6Protocol || socketProtocol == QAbstractSocket::AnyIPProtocol) { level = IPPROTO_IPV6; -#ifdef IPV6_RECVHOPLIMIT n = IPV6_RECVHOPLIMIT; -#endif } else if (socketProtocol == QAbstractSocket::IPv4Protocol) { #ifdef IP_RECVTTL // IP_RECVTTL is a non-standard extension supported on some OS level = IPPROTO_IP; @@ -1060,12 +1058,8 @@ qint64 QNativeSocketEnginePrivate::nativeReceiveDatagram(char *data, qint64 maxS #endif if (cmsgptr->cmsg_len == CMSG_LEN(sizeof(int)) -#ifdef IPV6_HOPLIMIT && ((cmsgptr->cmsg_level == IPPROTO_IPV6 && cmsgptr->cmsg_type == IPV6_HOPLIMIT) || (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_TTL))) { -#else - && (cmsgptr->cmsg_level == IPPROTO_IP && cmsgptr->cmsg_type == IP_TTL)) { -#endif static_assert(sizeof(header->hopLimit) == sizeof(int)); memcpy(&header->hopLimit, CMSG_DATA(cmsgptr), sizeof(header->hopLimit)); } @@ -1122,20 +1116,6 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l } if (msg.msg_namelen == sizeof(aa.a6)) { -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT -#ifdef IPV6_HOPLIMIT if (header.hopLimit != -1) { msg.msg_controllen += CMSG_SPACE(sizeof(int)); cmsgptr->cmsg_len = CMSG_LEN(sizeof(int)); @@ -1144,20 +1124,6 @@ qint64 QNativeSocketEnginePrivate::nativeSendDatagram(const char *data, qint64 l memcpy(CMSG_DATA(cmsgptr), &header.hopLimit, sizeof(int)); cmsgptr = reinterpret_cast(reinterpret_cast(cmsgptr) + CMSG_SPACE(sizeof(int))); } -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif -#endif if (header.ifindex != 0 || !header.senderAddress.isNull()) { struct in6_pktinfo *data = reinterpret_cast(CMSG_DATA(cmsgptr)); memset(data, 0, sizeof(*data));