diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-12-01 23:30:53 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2012-12-01 23:30:53 -0600 |
commit | 6955a7ebe3c3a0ae2af416fc57ca1f3e9af0ecc3 (patch) | |
tree | 76f40d456bda2b31029c7fb0354cc22102f435d6 /src/network | |
parent | 4c50ba8f9e58dc81abaf1407cc8b203c28288370 (diff) | |
download | tqt3-6955a7ebe3c3a0ae2af416fc57ca1f3e9af0ecc3.tar.gz tqt3-6955a7ebe3c3a0ae2af416fc57ca1f3e9af0ecc3.zip |
Automated update from Qt3
Diffstat (limited to 'src/network')
-rw-r--r-- | src/network/qdns.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp index 7a693e180..616b3dfd3 100644 --- a/src/network/qdns.cpp +++ b/src/network/qdns.cpp @@ -102,11 +102,17 @@ static TQ_UINT32 now() return 0; } +#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3))) +#define Q_MODERN_RES_API +#else +#endif static TQPtrList<TQHostAddress> * ns = 0; static TQStrList * domains = 0; static bool ipv6support = FALSE; +#if defined(Q_MODERN_RES_API) +#else static int qdns_res_init() { #ifdef Q_OS_MAC @@ -124,6 +130,7 @@ static int qdns_res_init() return 0; // not called at all on Windows. #endif } +#endif class TQDnsPrivate { @@ -2539,11 +2546,6 @@ void TQDns::doSynchronousLookup() } #endif -#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3))) -#define Q_MODERN_RES_API -#else -#endif - void TQDns::doResInit() { if ( ns ) |