diff options
| author | Gerald Combs <gerald@wireshark.org> | 2009-01-06 18:31:57 +0000 |
|---|---|---|
| committer | Gerald Combs <gerald@wireshark.org> | 2009-01-06 18:31:57 +0000 |
| commit | f5ee6caa671d170890ff5db8703f973eda9091cf (patch) | |
| tree | 500b94b248d0cd2e256fe0e6a0fd584c532690fc /epan/addr_resolv.c | |
| parent | c58ea3b4eb2e1f315e3101e2b4582ec4598bfc1f (diff) | |
| download | wireshark-f5ee6caa671d170890ff5db8703f973eda9091cf.tar.gz | |
From Frederic Leroy: Update c-ares version handling.
svn path=/trunk/; revision=27169
Diffstat (limited to 'epan/addr_resolv.c')
| -rw-r--r-- | epan/addr_resolv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/epan/addr_resolv.c b/epan/addr_resolv.c index 44f6182613..590c496ea9 100644 --- a/epan/addr_resolv.c +++ b/epan/addr_resolv.c @@ -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) { |