From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 9 Nov 2009 16:40:57 +0000 (+0000)
Subject: Checking the c-ares version, fix for c-ares >= 1.5.0.
X-Git-Tag: glite-lbjp-common-trio_R_1_0_1_1~8
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=25ef534534bf229a538e118c9aad6503badb1230;p=jra1mw.git

Checking the c-ares version, fix for c-ares >= 1.5.0.
---

diff --git a/org.glite.lb.server/src/bkserverd.c b/org.glite.lb.server/src/bkserverd.c
index 78a0db5..5e912bc 100644
--- a/org.glite.lb.server/src/bkserverd.c
+++ b/org.glite.lb.server/src/bkserverd.c
@@ -25,6 +25,7 @@
 #include <arpa/nameser.h>
 #include <resolv.h>
 #include <ares.h>
+#include <ares_version.h>
 #include <errno.h>
 
 #ifdef GLITE_LB_SERVER_WITH_WS
@@ -1582,7 +1583,11 @@ struct asyn_result {
 };
 
 /* ares callback handler for ares_gethostbyaddr()       */
+#if ARES_VERSION >= 0x010500
+static void callback_handler(void *arg, int status, int timeouts, struct hostent *h)
+#else
 static void callback_handler(void *arg, int status, struct hostent *h)
+#endif
 {
 	struct asyn_result *arp = (struct asyn_result *) arg;