osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

From Frederic Leroy: Update c-ares version handling. 

svn path=/trunk/; revision=27169
This commit is contained in:
Gerald Combs 2009-01-06 18:31:57 +00:00
parent c58ea3b4eb
commit f5ee6caa67
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
epan/addr_resolv.c
View File

@ -307,7 +307,8 @@ typedef struct _c_ares_queue_msg
int family;
} c_ares_queue_msg_t;
#if (( ARES_VERSION_MAJOR <= 1 ) && ( ARES_VERSION_MINOR < 5 ) )
#if ( ( ARES_VERSION_MAJOR < 1 ) \
|| ( 1 == ARES_VERSION_MAJOR && 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 +674,8 @@ static void fill_dummy_ip4(guint addr, hashipv4_t* volatile tp)
#ifdef HAVE_C_ARES
static void
#if (( ARES_VERSION_MAJOR <= 1 ) && ( ARES_VERSION_MINOR < 5 ) )
#if ( ( ARES_VERSION_MAJOR < 1 ) \
|| ( 1 == ARES_VERSION_MAJOR && 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) {