summaryrefslogtreecommitdiff
path: root/ace/OS_NS_arpa_inet.inl
diff options
context:
space:
mode:
authorJohnny Willemsen <jwillemsen@remedy.nl>2005-01-01 13:01:51 +0000
committerJohnny Willemsen <jwillemsen@remedy.nl>2005-01-01 13:01:51 +0000
commit17db4e80918af77e1bf3fffa0254efb30a9f6fee (patch)
tree8343386011ab9bfb8570a066497624fb33a7647a /ace/OS_NS_arpa_inet.inl
parent956711c23c21b73324d6bb59a761b7e8ff9708e2 (diff)
downloadATCD-17db4e80918af77e1bf3fffa0254efb30a9f6fee.tar.gz
ChangeLogTag: Sat Jan 1 11:45:12 UTC 2005 Johnny Willemsen <jwillemsen@remedy.nl>
Diffstat (limited to 'ace/OS_NS_arpa_inet.inl')
-rw-r--r--ace/OS_NS_arpa_inet.inl4
1 files changed, 2 insertions, 2 deletions
diff --git a/ace/OS_NS_arpa_inet.inl b/ace/OS_NS_arpa_inet.inl
index 8e42c253f6a..31a6b9a3f34 100644
--- a/ace/OS_NS_arpa_inet.inl
+++ b/ace/OS_NS_arpa_inet.inl
@@ -9,7 +9,7 @@ ACE_INLINE unsigned long
ACE_OS::inet_addr (const char *name)
{
ACE_OS_TRACE ("ACE_OS::inet_addr");
-#if defined (VXWORKS) || defined (ACE_PSOS)
+#if defined (ACE_PSOS)
u_long ret = 0;
u_int segment;
@@ -43,7 +43,7 @@ ACE_OS::inet_addr (const char *name)
}
return valid ? htonl (ret) : INADDR_NONE;
#elif defined (ACE_HAS_NONCONST_GETBY)
- return ::inet_addr ((char *) name);
+ return ::inet_addr (const_cast <char*> (name));
#else
return ::inet_addr (name);
#endif /* ACE_HAS_NONCONST_GETBY */