Updated support for Green Hills INTEGRITY and INTEGRITY-178 RTOS

ACE/ace/OS_NS_arpa_inet.cpp

@@ -102,24 +102,4 @@ ACE_OS::inet_aton (const char *host_name, struct in_addr *addr)
 #endif  /* ACE_LACKS_INET_ATON */
 }
 
-#if defined (ACE_INTEGRITY) && defined (ACE_LACKS_INET_NTOA)
-char* ACE_OS::inet_ntoa (const struct in_addr addr)
-{
-  ACE_OS_TRACE ("ACE_OS::inet_ntoa");
-
-  static ACE_thread_mutex_t mutex;
-  static char addrstr[INET_ADDRSTRLEN + 1] = { 0 };
-
-  LockGuard guard (mutex);
-  ACE_UINT32 ipaddr = ntohl (addr.s_addr);
-  sprintf (addrstr,
-           "%d.%d.%d.%d",
-           ((ipaddr & 0xff000000) >> 24) & 0x000000ff,
-           (ipaddr & 0x00ff0000) >> 16,
-           (ipaddr & 0x0000ff00) >> 8,
-           (ipaddr & 0x000000ff));
-  return addrstr;
-}
-#endif /* ACE_INTEGRITY && ACE_LACKS_INET_NTOA */
-
 ACE_END_VERSIONED_NAMESPACE_DECL

ACE/ace/OS_NS_arpa_inet.inl

@@ -53,7 +53,6 @@ ACE_OS::inet_addr (const char *name)
 #endif /* ACE_HAS_NONCONST_INET_ADDR */
 }
 
-#if !(defined (ACE_INTEGRITY) && defined (ACE_LACKS_INET_NTOA))
 ACE_INLINE char *
 ACE_OS::inet_ntoa (const struct in_addr addr)
 {
@@ -65,7 +64,6 @@ ACE_OS::inet_ntoa (const struct in_addr addr)
   return ::inet_ntoa (addr);
 # endif
 }
-#endif
 
 ACE_INLINE const char *
 ACE_OS::inet_ntop (int family, const void *addrptr, char *strptr, size_t len)

ACE/ace/OS_NS_sys_utsname.cpp

@@ -214,13 +214,17 @@ ACE_OS::uname (ACE_utsname *name)
 
   return ACE_OS::hostname (name->nodename, maxnamelen);
 #elif defined (ACE_INTEGRITY)
+# if defined (ACE_LACKS_GETHOSTNAME)
+  ACE_UNUSED_ARG (name);
+  ACE_NOTSUP_RETURN (-1);
+# else
   if (!name)
     {
       errno = EFAULT;
       return -1;
     }
 
-  if (ACE_OS::hostname (name->nodename, __SYS_NMLN) != 0)
+  if (::gethostname (name->nodename, __SYS_NMLN) != 0)
     return -1;
 
 # if defined (ACE_INTEGRITY178B)
@@ -233,8 +237,9 @@ ACE_OS::uname (ACE_utsname *name)
   ACE_OS::strcpy (name->release, "minor");
   ACE_OS::strcpy (name->version, "11.4.6");
   ACE_OS::strcpy (name->machine, "a standard name");
-# endif /* ACE_INTEGRITY178B */
+# endif
   return 0;
+# endif /* ACE_LACKS_GETHOSTNAME */
 #else
   ACE_UNUSED_ARG (name);
   ACE_NOTSUP_RETURN (-1);