C-ares version check fix from Frederic Leroy, modified by me.

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@27112 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c
index 97725ddd7f51db9ebc7096ed2284371652f3c972..44f618261321570c0a16cfafb27a04b48d5d2d24 100644 (file)
--- a/epan/addr_resolv.c
+++ b/epan/addr_resolv.c
@@ -307,7 +307,7 @@ typedef struct _c_ares_queue_msg
   int                 family;
 } c_ares_queue_msg_t;
 
-#if ARES_VERSION <= 0x140
+#if (( ARES_VERSION_MAJOR <= 1 ) && ( ARES_VERSION_MINOR  < 5 ) )
 static void c_ares_ghba_cb(void *arg, int status, struct hostent *hostent);
 #else
 static void c_ares_ghba_cb(void *arg, int status, int timeouts _U_, struct hostent *hostent);
@@ -673,7 +673,7 @@ static void fill_dummy_ip4(guint addr, hashipv4_t* volatile tp)
 #ifdef HAVE_C_ARES
 
 static void
-#if ARES_VERSION <= 0x140
+#if (( ARES_VERSION_MAJOR <= 1 ) && ( ARES_VERSION_MINOR  < 5 ) )
 c_ares_ghba_cb(void *arg, int status, struct hostent *he) {
 #else
 c_ares_ghba_cb(void *arg, int status, int timeouts _U_, struct hostent *he) {