Mon Mar 21 12:48:01 UTC 2011 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/INET_Addr.cpp:
        * ace/OS_NS_netdb.h:
        * ace/OS_NS_netdb.inl:
        * ace/OS_NS_netdb.cpp:
        * ace/OS_NS_pwd.h:
        * ace/Ping_Socket.h:
        * ace/Process.cpp:
        * ace/ace_wchar.h:
        * ace/os_include/os_signal.h:
        * ace/os_include/os_stdio.h:
          Cleanup, removed lot of old VxWorks code not needed anymore

        * include/makeinclude/platform_sunos5_common.GNU:
          Add to the correct make flags

1 files changed, 0 insertions, 192 deletions

diff --git a/ACE/ace/OS_NS_netdb.cpp b/ACE/ace/OS_NS_netdb.cpp
index 552ee178443..21296190a04 100644
--- a/ACE/ace/OS_NS_netdb.cpp
+++ b/ACE/ace/OS_NS_netdb.cpp
@@ -3,8 +3,6 @@
 
 #include "ace/OS_NS_netdb.h"
 
-
-
 #if !defined (ACE_HAS_INLINED_OSCALLS)
 # include "ace/OS_NS_netdb.inl"
 #endif /* ACE_HAS_INLINED_OSCALLS */
@@ -17,196 +15,6 @@
 #include "ace/OS_NS_stropts.h"
 #include "ace/OS_NS_sys_socket.h"
 
-ACE_BEGIN_VERSIONED_NAMESPACE_DECL
-
-#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYADDR)
-
-struct hostent *
-ACE_OS::gethostbyaddr (const char *addr, int length, int type)
-{
-  ACE_OS_TRACE ("ACE_OS::gethostbyaddr");
-
-  if (length != 4 || type != AF_INET)
-    {
-      errno = EINVAL;
-      return 0;
-    }
-
-  // not thread safe!
-  static hostent ret;
-  static char name [MAXNAMELEN + 1];
-  static char *hostaddr[2];
-  static char *aliases[1];
-
-  if (::hostGetByAddr (*(int *) addr, name) != 0)
-    {
-      // errno will have been set to S_hostLib_UNKNOWN_HOST.
-      return 0;
-    }
-
-  // Might not be official: just echo input arg.
-  hostaddr[0] = (char *) addr;
-  hostaddr[1] = 0;
-  aliases[0] = 0;
-
-  ret.h_name = name;
-  ret.h_addrtype = AF_INET;
-  ret.h_length = 4;  // VxWorks 5.2/3 doesn't define IP_ADDR_LEN;
-  ret.h_addr_list = hostaddr;
-  ret.h_aliases = aliases;
-
-  return &ret;
-}
-
-#endif /* ACE_VXWORKS && ACE_LACKS_GETHOSTBYADDR */
-
-#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYADDR)
-
-struct hostent *
-ACE_OS::gethostbyaddr_r (const char *addr, int length, int type,
-                         hostent *result, ACE_HOSTENT_DATA buffer,
-                         int *h_errnop)
-{
-  ACE_OS_TRACE ("ACE_OS::gethostbyaddr_r");
-  if (length != 4 || type != AF_INET)
-    {
-      errno = EINVAL;
-      return 0;
-    }
-
-  if (ACE_OS::netdb_acquire ())
-    return 0;
-  else
-    {
-      // buffer layout:
-      // buffer[0-3]: h_addr_list[0], the first (and only) addr.
-      // buffer[4-7]: h_addr_list[1], the null terminator for the h_addr_list.
-      // buffer[8]: the name of the host, null terminated.
-
-      // Call ::hostGetByAddr (), which puts the (one) hostname into
-      // buffer.
-      if (::hostGetByAddr (*(int *) addr, &buffer[8]) == 0)
-        {
-          // Store the return values in result.
-          result->h_name = &buffer[8];  // null-terminated host name
-          result->h_addrtype = AF_INET;
-          result->h_length = 4;  // VxWorks 5.2/3 doesn't define IP_ADDR_LEN.
-
-          result->h_addr_list = (char **) buffer;
-          // Might not be official: just echo input arg.
-          result->h_addr_list[0] = (char *) addr;
-          // Null-terminate the list of addresses.
-          result->h_addr_list[1] = 0;
-          // And no aliases, so null-terminate h_aliases.
-          result->h_aliases = &result->h_addr_list[1];
-        }
-      else
-        {
-          // errno will have been set to S_hostLib_UNKNOWN_HOST.
-          result = 0;
-        }
-    }
-
-  ACE_OS::netdb_release ();
-  *h_errnop = errno;
-  return result;
-}
-
-#endif /* ACE_VXWORKS && ACE_LACKS_GETHOSTBYADDR */
-
-#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)
-
-struct hostent *
-ACE_OS::gethostbyname (const char *name)
-{
-  ACE_OS_TRACE ("ACE_OS::gethostbyname");
-
-  // not thread safe!
-  static hostent ret;
-  static int first_addr;
-  static char *hostaddr[2];
-  static char *aliases[1];
-
-  if (0 == name || '\0' == name[0])
-    return 0;
-
-  ACE_OSCALL (::hostGetByName (const_cast <char *> (name)), int, -1, first_addr);
-  if (first_addr == -1)
-    return 0;
-
-  hostaddr[0] = (char *) &first_addr;
-  hostaddr[1] = 0;
-  aliases[0] = 0;
-
-  // Might not be official: just echo input arg.
-  ret.h_name = (char *) name;
-  ret.h_addrtype = AF_INET;
-  ret.h_length = 4;  // VxWorks 5.2/3 doesn't define IP_ADDR_LEN;
-  ret.h_addr_list = hostaddr;
-  ret.h_aliases = aliases;
-
-  return &ret;
-}
-
-#endif /* ACE_VXWORKS && ACE_LACKS_GETHOSTBYNAME */
-
-#if defined (ACE_VXWORKS) && defined (ACE_LACKS_GETHOSTBYNAME)
-
-struct hostent *
-ACE_OS::gethostbyname_r (const char *name, hostent *result,
-                         ACE_HOSTENT_DATA buffer,
-                         int *h_errnop)
-{
-  ACE_OS_TRACE ("ACE_OS::gethostbyname_r");
-
-  if (0 == name || '\0' == name[0])
-    return 0;
-
-  if (ACE_OS::netdb_acquire ())
-    return 0;
-  else
-    {
-      int addr;
-      ACE_OSCALL (::hostGetByName (const_cast <char *> (name)), int, -1, addr);
-
-      if (addr == -1)
-        {
-          // errno will have been set to S_hostLib_UNKNOWN_HOST
-          result = 0;
-        }
-      else
-        {
-          // Might not be official: just echo input arg.
-          result->h_name = (char *) name;
-          result->h_addrtype = AF_INET;
-          result->h_length = 4;  // VxWorks 5.2/3 doesn't define IP_ADDR_LEN;
-
-          // buffer layout:
-          // buffer[0-3]: h_addr_list[0], pointer to the addr.
-          // buffer[4-7]: h_addr_list[1], null terminator for the h_addr_list.
-          // buffer[8-11]: the first (and only) addr.
-
-          // Store the address list in buffer.
-          result->h_addr_list = (char **) buffer;
-          // Store the actual address _after_ the address list.
-          result->h_addr_list[0] = (char *) &result->h_addr_list[2];
-          result->h_addr_list[2] = (char *) addr;
-          // Null-terminate the list of addresses.
-          result->h_addr_list[1] = 0;
-          // And no aliases, so null-terminate h_aliases.
-          result->h_aliases = &result->h_addr_list[1];
-        }
-    }
-
-  ACE_OS::netdb_release ();
-  *h_errnop = errno;
-  return result;
-}
-
-#endif /* ACE_VXWORKS && ACE_LACKS_GETHOSTBYNAME*/
-
-ACE_END_VERSIONED_NAMESPACE_DECL
-
 // Include if_arp so that getmacaddr can use the
 // arp structure.
 #if defined (sun)