diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-10-30 18:20:17 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-10-30 18:20:17 +0000 |
| commit | 0a5ac52b494453cd3687b0a424fd068ba8673033 (patch) | |
| tree | 0f34af7d49b9045c18a3d5e34fbdf13c5c42c4ae | |
| parent | 8acb3803e496025a5133de28ac570465e5f74de3 (diff) | |
| download | gnurl-0a5ac52b494453cd3687b0a424fd068ba8673033.tar.gz gnurl-0a5ac52b494453cd3687b0a424fd068ba8673033.tar.bz2 gnurl-0a5ac52b494453cd3687b0a424fd068ba8673033.zip | |
Header inclusion depending on HAVE_* symbol.
Fix two typos.
| -rw-r--r-- | ares/ares_parse_txt_reply.c | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/ares/ares_parse_txt_reply.c b/ares/ares_parse_txt_reply.c index 6b0a78735..6a83b0709 100644 --- a/ares/ares_parse_txt_reply.c +++ b/ares/ares_parse_txt_reply.c @@ -19,21 +19,34 @@ #include "setup.h" -#if defined(WIN32) && !defined(WATT32) -#include "nameser.h" +#ifdef HAVE_SYS_SOCKET_H +# include <sys/socket.h> +#endif +#ifdef HAVE_NETINET_IN_H +# include <netinet/in.h> +#endif +#ifdef HAVE_NETDB_H +# include <netdb.h> +#endif +#ifdef HAVE_ARPA_INET_H +# include <arpa/inet.h> +#endif +#ifdef HAVE_ARPA_NAMESER_H +# include <arpa/nameser.h> #else -#include <sys/socket.h> -#include <netinet/in.h> -#include <arpa/inet.h> -#include <netdb.h> -#include <arpa/nameser.h> +# include "nameser.h" +#endif #ifdef HAVE_ARPA_NAMESER_COMPAT_H -#include <arpa/nameser_compat.h> +# include <arpa/nameser_compat.h> #endif + +#ifdef HAVE_STRINGS_H +# include <strings.h> #endif #include <stdlib.h> #include <string.h> + #include "ares.h" #include "ares_dns.h" #include "ares_private.h" @@ -168,9 +181,9 @@ ares_parse_txt_reply (const unsigned char *abuf, int alen, rr_name = NULL; } - if (hostname); + if (hostname) free (hostname); - if (rr_name); + if (rr_name) free (rr_name); /* clean up on error */ |