diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-01-17 18:49:37 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2006-01-17 18:49:37 +0000 |
| commit | 8ce9d4262cb3e281fa8ae5678fbdad0ea8e54175 (patch) | |
| tree | c9557826840e6b0090b71db3bca06a24dd98caab /ace/INET_Addr.cpp | |
| parent | 39a4a9371e75afb5908a3975e1dc988e2e33c397 (diff) | |
| download | ATCD-8ce9d4262cb3e281fa8ae5678fbdad0ea8e54175.tar.gz | |
ChangeLogTag: Tue Jan 17 18:49:12 UTC 2006 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace/INET_Addr.cpp')
| -rw-r--r-- | ace/INET_Addr.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/ace/INET_Addr.cpp b/ace/INET_Addr.cpp index d07ec78942d..91b32ae20fe 100644 --- a/ace/INET_Addr.cpp +++ b/ace/INET_Addr.cpp @@ -331,7 +331,7 @@ ACE_INET_Addr::set (u_short port_number, hostent *hp = ACE_OS::gethostbyname_r (host_name, &hentry, buf, &h_error); -# endif /* VXWORKS */ +# endif /* ACE_VXWORKS */ if (hp == 0) { @@ -782,7 +782,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const } else { -#if defined (VXWORKS) +#if defined (ACE_VXWORKS) ACE_UNUSED_ARG (len); int error = ::hostGetByAddr ((int) this->inet_addr_.in4_.sin_addr.s_addr, @@ -831,7 +831,7 @@ ACE_INET_Addr::get_host_name_i (char hostname[], size_t len) const ACE_OS::strcpy (hostname, hp->h_name); return 0; -#endif /* VXWORKS */ +#endif /* ACE_VXWORKS */ } } @@ -1021,7 +1021,7 @@ ACE_INET_Addr::get_host_addr (char *dst, int size) const } #endif /* ACE_HAS_IPV6 */ -#if defined (VXWORKS) +#if defined (ACE_VXWORKS) ACE_UNUSED_ARG (dst); ACE_UNUSED_ARG (size); @@ -1034,7 +1034,7 @@ ACE_INET_Addr::get_host_addr (char *dst, int size) const inet_ntoa_b(this->inet_addr_.in4_.sin_addr, ncthis->buf_); ACE_OS::strsncpy (dst, &buf_[0], size); return &buf_[0]; -#else /* VXWORKS */ +#else /* ACE_VXWORKS */ char *ch = ACE_OS::inet_ntoa (this->inet_addr_.in4_.sin_addr); ACE_OS::strsncpy (dst, ch, size); return ch; @@ -1050,7 +1050,7 @@ ACE_INET_Addr::get_host_addr (void) const static char buf[INET6_ADDRSTRLEN]; return this->get_host_addr (buf, INET6_ADDRSTRLEN); #else /* ACE_HAS_IPV6 */ -# if defined (VXWORKS) +# if defined (ACE_VXWORKS) // It would be nice to be able to encapsulate this into // ACE_OS::inet_ntoa(), but that would lead to either inefficiencies // on vxworks or lack of thread safety. @@ -1059,9 +1059,9 @@ ACE_INET_Addr::get_host_addr (void) const ACE_INET_Addr *ncthis = const_cast<ACE_INET_Addr *> (this); inet_ntoa_b (this->inet_addr_.in4_.sin_addr, ncthis->buf_); return &buf_[0]; -# else /* VXWORKS */ +# else /* ACE_VXWORKS */ return ACE_OS::inet_ntoa (this->inet_addr_.in4_.sin_addr); -# endif /* !VXWORKS */ +# endif /* !ACE_VXWORKS */ #endif /* !ACE_HAS_IPV6 */ } |