diff options
| author | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:59:08 +0900 |
|---|---|---|
| committer | Yu Jiung <jiung.yu@samsung.com> | 2016-11-10 16:59:08 +0900 |
| commit | 6e8e7a899a742f7f170ff6f07a26cf4832f4fdc9 (patch) | |
| tree | 81f0750d91aa467df3ee81cf30d22a65db2e6685 /ares_ipv6.h | |
| parent | d82f8426a5e255f0533f07ee458870ba124f90e7 (diff) | |
| parent | 45e88a8337839e5fd88519bc55467053d521c9f6 (diff) | |
| download | c-ares-6e8e7a899a742f7f170ff6f07a26cf4832f4fdc9.tar.gz c-ares-6e8e7a899a742f7f170ff6f07a26cf4832f4fdc9.tar.bz2 c-ares-6e8e7a899a742f7f170ff6f07a26cf4832f4fdc9.zip | |
Merge branch 'tizen' into tizen_3.0_basesubmit/tizen_3.0_base/20161116.053912submit/tizen_3.0.m2_base/20170104.073748submit/tizen_3.0.m2_base/20170104.072059accepted/tizen/3.0/base/20161118.080913accepted/tizen/3.0.m2/base/20170104.082100tizen_3.0.m2_baseaccepted/tizen_3.0.m2_base
Conflicts:
packaging/c-ares.spec
Change-Id: Id23d5351f77b4520d8bbcc4c0e1eb09136018b58
Diffstat (limited to 'ares_ipv6.h')
| -rw-r--r-- | ares_ipv6.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ares_ipv6.h b/ares_ipv6.h index 6f1022a..b0017f1 100644 --- a/ares_ipv6.h +++ b/ares_ipv6.h @@ -47,16 +47,16 @@ struct addrinfo #endif #ifndef NS_IN6ADDRSZ -#if SIZEOF_STRUCT_IN6_ADDR == 0 +#ifndef HAVE_STRUCT_IN6_ADDR /* We cannot have it set to zero, so we pick a fixed value here */ #define NS_IN6ADDRSZ 16 #else -#define NS_IN6ADDRSZ SIZEOF_STRUCT_IN6_ADDR +#define NS_IN6ADDRSZ sizeof(struct in6_addr) #endif #endif #ifndef NS_INADDRSZ -#define NS_INADDRSZ SIZEOF_STRUCT_IN_ADDR +#define NS_INADDRSZ sizeof(struct in_addr) #endif #ifndef NS_INT16SZ @@ -71,7 +71,7 @@ struct addrinfo #endif #endif -/* Defined in ares_net_pton.c for no particular reason. */ +/* Defined in inet_net_pton.c for no particular reason. */ extern const struct ares_in6_addr ares_in6addr_any; /* :: */ |