From 8a351bdbd9f2976839d6efb246606199851b39a6 Mon Sep 17 00:00:00 2001 From: OBATA Akio Date: Wed, 8 Jul 2020 17:22:01 +0900 Subject: [PATCH] Improve modern res API available condition `__RES` is usable to check release date of resolver library. Such modern res API appeared in BIND-8.2.0 libbind with __RES == 19980901, it was refrected as BIND-8.2.2-P5 in glibc in pre 2.3 release with __RES == 19991006. Signed-off-by: OBATA Akio (cherry picked from commit b676c7f90b894b7c715d924c53b9dc4b4fef4589) --- src/network/qdns.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp index 33f6d2e..965eae9 100644 --- a/src/network/qdns.cpp +++ b/src/network/qdns.cpp @@ -102,7 +102,6 @@ static Q_UINT32 now() return 0; } - static QPtrList * ns = 0; static QStrList * domains = 0; static bool ipv6support = FALSE; @@ -2539,7 +2538,7 @@ void QDns::doSynchronousLookup() } #endif -#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3))) +#if defined(__RES) && (__RES >= 19980901) #define Q_MODERN_RES_API #else #endif