diff options
| author | Steve Huston <shuston@riverace.com> | 2010-10-28 18:01:45 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2010-10-28 18:01:45 +0000 |
| commit | 0fb141e86f5d092af04dd64a2b48ff1d6a95d485 (patch) | |
| tree | 5a2ed22046c3c8faa374d46b4c5c2478b5ead1ef | |
| parent | bea2cd2a1f4a82ac394001718f20baae1e5d84b6 (diff) | |
| download | ATCD-0fb141e86f5d092af04dd64a2b48ff1d6a95d485.tar.gz | |
ChangeLogTag:Thu Oct 28 17:45:10 UTC 2010 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ace/INET_Addr.cpp | 13 |
2 files changed, 11 insertions, 7 deletions
diff --git a/ChangeLog b/ChangeLog index 6d30caaae71..d837e72c161 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Oct 28 17:45:10 UTC 2010 Steve Huston <shuston@riverace.com> + + * ace/INET_Addr.cpp (set): Corrected ACE_HAS_IPV6 checks made in + Wed Oct 27 22:16:12 UTC 2010 Steve Huston <shuston@riverace.com>. + Wed Oct 27 22:16:12 UTC 2010 Steve Huston <shuston@riverace.com> * ace/INET_Addr.cpp (set): When looking up a hostname, always use diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index f446db0030f..5f7720eb897 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -380,15 +380,15 @@ ACE_INET_Addr::set (u_short port_number, ::freeaddrinfo (res); return 0; } -#else /* ACE_HAS_IPV6 */ +#endif /* ACE_HAS_IPV6 */ // IPv6 not supported... insure the family is set to IPv4 address_family = AF_INET; this->set_type (address_family); this->inet_addr_.in4_.sin_family = static_cast<short> (address_family); -# ifdef ACE_HAS_SOCKADDR_IN_SIN_LEN +#ifdef ACE_HAS_SOCKADDR_IN_SIN_LEN this->inet_addr_.in4_.sin_len = sizeof (this->inet_addr_.in4_); -# endif +#endif struct in_addr addrv4; if (ACE_OS::inet_aton (host_name, &addrv4) == 1) @@ -397,9 +397,9 @@ ACE_INET_Addr::set (u_short port_number, encode); else { -# if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME) +#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME) hostent *hp = ACE_OS::gethostbyname (host_name); -# else +#else hostent hentry; ACE_HOSTENT_DATA buf; int h_error = 0; // Not the same as errno! @@ -408,7 +408,7 @@ ACE_INET_Addr::set (u_short port_number, buf, &h_error); if (hp == 0) errno = h_error; -# endif /* ACE_VXWORKS */ +#endif /* ACE_VXWORKS */ if (hp == 0) { @@ -424,7 +424,6 @@ ACE_INET_Addr::set (u_short port_number, encode); } } -#endif /* ACE_HAS_IPV6 */ } // Helper function to get a port number from a port name. |