aboutsummaryrefslogtreecommitdiff
path: root/ares/ares.h
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2007-11-15 19:44:01 +0000
committerYang Tse <yangsita@gmail.com>2007-11-15 19:44:01 +0000
commitca95f58ac0d5c9cc8f56517917af8b83248777f7 (patch)
treeb8dc0e3d9ef21e7fdc85404d42e858822101e381 /ares/ares.h
parented636cbe4482e20bee084f2f83df494babb4defd (diff)
Needed now that in6_addr is referenced in ares.h
Diffstat (limited to 'ares/ares.h')
-rw-r--r--ares/ares.h17
1 files changed, 15 insertions, 2 deletions
diff --git a/ares/ares.h b/ares/ares.h
index 5e3431010..37ad9b95c 100644
--- a/ares/ares.h
+++ b/ares/ares.h
@@ -43,8 +43,12 @@
#include <sys/socket.h>
#include <tcp.h>
#elif defined(WIN32)
- #include <winsock2.h>
- #include <windows.h>
+# ifndef WIN32_LEAN_AND_MEAN
+# define WIN32_LEAN_AND_MEAN
+# endif
+# include <windows.h>
+# include <winsock2.h>
+# include <ws2tcpip.h>
#else
#include <netinet/in.h>
#include <sys/socket.h>
@@ -241,6 +245,15 @@ int ares_expand_name(const unsigned char *encoded, const unsigned char *abuf,
int ares_expand_string(const unsigned char *encoded, const unsigned char *abuf,
int alen, unsigned char **s, long *enclen);
+#ifndef s6_addr
+struct in6_addr {
+ union {
+ unsigned char _S6_u8[16];
+ } _S6_un;
+};
+#define s6_addr _S6_un._S6_u8
+#endif
+
struct addrttl {
struct in_addr ipaddr;
int ttl;