summaryrefslogtreecommitdiff
path: root/ares.h
diff options
context:
space:
mode:
authorYang Tse <yangsita@gmail.com>2009-11-23 01:24:17 (GMT)
committerYang Tse <yangsita@gmail.com>2009-11-23 01:24:17 (GMT)
commit36b26039acc147b9b6839b12049707b531b62e32 (patch)
tree03e409cf430ee17291ee4ce01b763dfbf5a49392 /ares.h
parent497afa9acb4d42b4bb186701f0d03a02884ff9b2 (diff)
downloadc-ares-36b26039acc147b9b6839b12049707b531b62e32.zip
c-ares-36b26039acc147b9b6839b12049707b531b62e32.tar.gz
c-ares-36b26039acc147b9b6839b12049707b531b62e32.tar.bz2
- Jakub Hrozek renamed addrttl and addr6ttl structs to ares_addrttl and
ares_addr6ttl in order to prevent name space pollution, along with necessary changes to code base and man pages.This change does not break ABI, there is no need to recompile existing applications. But existing applications using these structs with the old name will need source code adjustments when recompiled using c-ares 1.6.1.
Diffstat (limited to 'ares.h')
-rw-r--r--ares.h13
1 files changed, 5 insertions, 8 deletions
diff --git a/ares.h b/ares.h
index e79debd..3e45a90 100644
--- a/ares.h
+++ b/ares.h
@@ -416,15 +416,12 @@ struct ares_in6_addr {
} _S6_un;
};
-/*
- * TODO: the structs 'addrttl' and 'addr6ttl' really should get their names
- * prefixed with ares_ to keep them in our own "name space".
- */
-struct addrttl {
+struct ares_addrttl {
struct in_addr ipaddr;
int ttl;
};
-struct addr6ttl {
+
+struct ares_addr6ttl {
struct ares_in6_addr ip6addr;
int ttl;
};
@@ -454,13 +451,13 @@ struct ares_txt_reply {
CARES_EXTERN int ares_parse_a_reply(const unsigned char *abuf,
int alen,
struct hostent **host,
- struct addrttl *addrttls,
+ struct ares_addrttl *addrttls,
int *naddrttls);
CARES_EXTERN int ares_parse_aaaa_reply(const unsigned char *abuf,
int alen,
struct hostent **host,
- struct addr6ttl *addrttls,
+ struct ares_addr6ttl *addrttls,
int *naddrttls);
CARES_EXTERN int ares_parse_ptr_reply(const unsigned char *abuf,