# ===================================================================== # === Patches specific to qtnetwork === # ===================================================================== --- a/src/network/kernel/qdnslookup_unix.cpp 2018-01-18 11:58:42.360052900 +0100 +++ b/src/network/kernel/qdnslookup_unix.cpp 2018-01-18 11:58:42.578839500 +0100 @@ -56,6 +56,8 @@ #if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__) # include +#elif defined(Q_OS_CYGWIN) +# define LIBRESOLV_SO "cygwin1.dll" #endif QT_BEGIN_NAMESPACE --- a/src/network/kernel/qhostinfo_unix.cpp 2018-01-18 11:58:42.406929200 +0100 +++ b/src/network/kernel/qhostinfo_unix.cpp 2018-01-18 11:58:42.594452600 +0100 @@ -64,6 +64,8 @@ #if defined(__GNU_LIBRARY__) && !defined(__UCLIBC__) # include +#elif defined(Q_OS_CYGWIN) +# define LIBRESOLV_SO "cygwin1.dll" #endif #if defined (QT_NO_GETADDRINFO) --- a/src/network/socket/qnativesocketengine_unix.cpp 2018-01-19 08:21:39.537806700 +0100 +++ b/src/network/socket/qnativesocketengine_unix.cpp 2018-01-19 08:21:39.600143800 +0100 @@ -203,7 +203,9 @@ case QNativeSocketEngine::ReceivePacketInformation: if (socketProtocol == QAbstractSocket::IPv6Protocol || socketProtocol == QAbstractSocket::AnyIPProtocol) { level = IPPROTO_IPV6; +#ifdef IPV6_RECVPKTINFO n = IPV6_RECVPKTINFO; +#endif } else if (socketProtocol == QAbstractSocket::IPv4Protocol) { level = IPPROTO_IP; #ifdef IP_PKTINFO @@ -218,7 +220,9 @@ 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; @@ -942,6 +946,9 @@ Q_ASSERT(header); qt_socket_getPortAndAddress(&aa, &header->senderPort, &header->senderAddress); header->destinationPort = localPort; +#ifndef MSG_EOR +#define MSG_EOR 0 +#endif header->endOfRecord = (msg.msg_flags & MSG_EOR) != 0; // parse the ancillary data