summaryrefslogtreecommitdiff
path: root/ACE/ace/INET_Addr.inl
diff options
context:
space:
mode:
authorwolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-02-23 21:33:57 +0000
committerwolff1 <wolff1@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2009-02-23 21:33:57 +0000
commita10286c7bf3faf525feb22a40852a10644666fec (patch)
treeae59833feb0069d74a932c0b86bbd4da04dfc7e2 /ACE/ace/INET_Addr.inl
parent21bd6c21eb3346a10e81be73857e45ed241ceca3 (diff)
downloadATCD-a10286c7bf3faf525feb22a40852a10644666fec.tar.gz
merge in changes from trunk/ACE revisions 83248 - 84587
Diffstat (limited to 'ACE/ace/INET_Addr.inl')
-rw-r--r--ACE/ace/INET_Addr.inl10
1 files changed, 4 insertions, 6 deletions
diff --git a/ACE/ace/INET_Addr.inl b/ACE/ace/INET_Addr.inl
index a05a80db7fb..21d053b7bc5 100644
--- a/ACE/ace/INET_Addr.inl
+++ b/ACE/ace/INET_Addr.inl
@@ -88,15 +88,13 @@ ACE_INLINE u_short
ACE_INET_Addr::get_port_number (void) const
{
ACE_TRACE ("ACE_INET_Addr::get_port_number");
-#if defined (ACE_LACKS_NTOHS)
- ACE_NOTSUP_RETURN (0);
-#elif defined (ACE_HAS_IPV6)
+#if defined (ACE_HAS_IPV6)
if (this->get_type () == PF_INET)
- return ntohs (this->inet_addr_.in4_.sin_port);
+ return ACE_NTOHS (this->inet_addr_.in4_.sin_port);
else
- return ntohs (this->inet_addr_.in6_.sin6_port);
+ return ACE_NTOHS (this->inet_addr_.in6_.sin6_port);
#else
- return ntohs (this->inet_addr_.in4_.sin_port);
+ return ACE_NTOHS (this->inet_addr_.in4_.sin_port);
#endif /* ACE_HAS_IPV6 */
}