diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2017-04-06 19:14:19 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-06 19:14:19 +0200 |
| commit | fae93c9ce7e8130077306798d26d4ddcb3dd1ef4 (patch) | |
| tree | 360636e537f9b37df26c16eed5d60839f91057b1 | |
| parent | 1f9260babb4fb6b8dc35bb281361cbd91d4dd4ee (diff) | |
| parent | 07d232e86543b58f090eb46daebe1a335fb52a0a (diff) | |
| download | ATCD-fae93c9ce7e8130077306798d26d4ddcb3dd1ef4.tar.gz | |
Merge pull request #393 from jwillemsen/master
Fixed compile warning at the moment ACE_HAS_IPV6 is not defined
| -rw-r--r-- | ACE/tests/INET_Addr_Test_IPV6.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ACE/tests/INET_Addr_Test_IPV6.cpp b/ACE/tests/INET_Addr_Test_IPV6.cpp index e0522c126c1..c687832b66b 100644 --- a/ACE/tests/INET_Addr_Test_IPV6.cpp +++ b/ACE/tests/INET_Addr_Test_IPV6.cpp @@ -17,6 +17,8 @@ #include "ace/Log_Msg.h" #include "ace/OS_NS_arpa_inet.h" +#if defined (ACE_HAS_IPV6) + #define LINK_LOCAL_ADDR ACE_TEXT ("fe80::") #define THE_INTERFACE ("eth0") @@ -31,13 +33,11 @@ static int check_type_consistency (const ACE_INET_Addr &addr) struct sockaddr_in *sa4 = (struct sockaddr_in *)addr.get_addr(); family = sa4->sin_family; } -#if defined (ACE_HAS_IPV6) else if (addr.get_type () == AF_INET6) { struct sockaddr_in6 *sa6 = (struct sockaddr_in6 *)addr.get_addr(); family = sa6->sin6_family; } -#endif if (addr.get_type () != family) { @@ -100,6 +100,7 @@ static bool check_both_families() } return good; } +#endif /* ACE_HAS_IPV6 */ int run_main (int, ACE_TCHAR *[]) |