diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-02-02 13:49:51 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-02-02 13:49:51 +0000 |
| commit | 76aad1de2b38faaa491489119606bd9ed910a832 (patch) | |
| tree | 4cedb5e12baa5735210c9db3c26128f0b8507dfb /src | |
| parent | abcc0146759f34fad83730b37776716ba3250ff0 (diff) | |
2010-02-02 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Drop legacy ifdef for ares support and code cleanup.
* src/AsyncNameResolver.cc
* src/AsyncNameResolver.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/AsyncNameResolver.cc | 9 | ||||
| -rw-r--r-- | src/AsyncNameResolver.h | 12 |
2 files changed, 7 insertions, 14 deletions
diff --git a/src/AsyncNameResolver.cc b/src/AsyncNameResolver.cc index 217cf108..31f6977d 100644 --- a/src/AsyncNameResolver.cc +++ b/src/AsyncNameResolver.cc @@ -33,10 +33,11 @@ */ /* copyright --> */ #include "AsyncNameResolver.h" -#include "util.h" -#include "A2STR.h" + #include <cstring> +#include "A2STR.h" + namespace aria2 { #ifdef HAVE_LIBCARES1_5 @@ -47,11 +48,7 @@ void callback(void* arg, int status, int timeouts, struct hostent* host) { AsyncNameResolver* resolverPtr = reinterpret_cast<AsyncNameResolver*>(arg); if(status != ARES_SUCCESS) { -#ifdef HAVE_LIBCARES resolverPtr->error = ares_strerror(status); -#else - resolverPtr->error = ares_strerror(status, 0); -#endif // HAVE_LIBCARES resolverPtr->status = AsyncNameResolver::STATUS_ERROR; return; } diff --git a/src/AsyncNameResolver.h b/src/AsyncNameResolver.h index f2ee0add..bae2f769 100644 --- a/src/AsyncNameResolver.h +++ b/src/AsyncNameResolver.h @@ -36,18 +36,14 @@ #define _D_ASYNC_NAME_RESOLVER_H_ #include "common.h" -#include "SharedHandle.h" -#include "a2netcompat.h" + #include <string> #include <deque> -#ifdef __cplusplus -extern "C" { -#endif #include <ares.h> -#ifdef __cplusplus -} /* end of extern "C" */ -#endif + +#include "SharedHandle.h" +#include "a2netcompat.h" namespace aria2 { |