From 7aa5ac7f0e76c5b87e4ca837b75b3edd522a3372 Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Sat, 1 Dec 2012 23:30:27 -0600
Subject: Fix a number of build warnings that could lead to unstable operation
 This breaks the ABI

---
 src/network/qdns.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/network/qdns.cpp')

diff --git a/src/network/qdns.cpp b/src/network/qdns.cpp
index 33f6d2e..0b41d6c 100644
--- a/src/network/qdns.cpp
+++ b/src/network/qdns.cpp
@@ -102,11 +102,17 @@ static Q_UINT32 now()
     return 0;
 }
 
+#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)))
+#define Q_MODERN_RES_API
+#else
+#endif
 
 static QPtrList<QHostAddress> * ns = 0;
 static QStrList * 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 QDnsPrivate {
@@ -2539,11 +2546,6 @@ void QDns::doSynchronousLookup()
 }
 #endif
 
-#if defined(__GLIBC__) && ((__GLIBC__ > 2) || ((__GLIBC__ == 2) && (__GLIBC_MINOR__ >= 3)))
-#define Q_MODERN_RES_API
-#else
-#endif
-
 void QDns::doResInit()
 {
     if ( ns )
-- 
cgit v1.2.3