Thu Sep 9 09:01:10 UTC 2010 Johnny Willemsen <jwillemsen@remedy.nl>

        * ace/ACE.cpp:
        * ace/ACE_export.h:
        * ace/ETCL/ETCL_y.cpp:
        * ace/INET_Addr.cpp:
        * ace/Log_Msg.cpp:
        * ace/OS.inl:
        * ace/OS_NS_Thread.h:
        * ace/OS_NS_Thread.inl:
        * ace/OS_NS_Thread.cpp:
        * ace/OS_NS_ctype.cpp:
        * ace/OS_NS_netdb.inl:
        * ace/OS_NS_pwd.inl:
        * ace/OS_NS_stdlib.inl:
        * ace/OS_NS_time.inl:
        * ace/OS_NS_time.cpp:
        * ace/POSIX_CB_Proactor.cpp:
        * ace/POSIX_Proactor.cpp:
        * ace/config-cxx-common.h:
        * ace/config-doxygen.h:
        * ace/config-integritySCA.h:
        * ace/config-lynxos.h:
        * ace/config-macros.h:
        * ace/config-openvms.h:
        * ace/config-tandem-nsk-mips-v2.h:
        * ace/config-tandem-nsk-mips-v3.h:
        * ace/config-vxworks6.4.h:
        * ace/config-win32-common.h:
        * ace/os_include/os_pthread.h:
        * ace/os_include/os_pwd.h:
        * ace/os_include/os_signal.h:
        * ace/os_include/os_stdlib.h:
        * ace/os_include/os_time.h:
        * ace/os_include/sys/os_types.h:
          Removed Tru64, Irix, Unixware, and SCO support

        * debian/debian.rules:
          Improved

        * examples/QOS/Change_Receiver_FlowSpec/Receiver_QoS_Event_Handler.h:
        * examples/QOS/Change_Receiver_FlowSpec/Sender_QoS_Event_Handler.h:
        * examples/QOS/Change_Sender_TSpec/Receiver_QoS_Event_Handler.h:
        * examples/QOS/Change_Sender_TSpec/Sender_QoS_Event_Handler.h:
        * examples/QOS/Simple/Receiver_QoS_Event_Handler.h:
        * examples/QOS/Simple/Sender_QoS_Event_Handler.h:
          Zapped ACE_RCSID

        * ace/config-irix6.5.x-sgic++.h:
        * ace/config-irix6.x-common.h:
        * ace/config-irix6.x-g++.h:
        * ace/config-irix6.x-sgic++.h:
        * ace/config-sco-5.0.0-nothread.h:
        * ace/config-sco-5.0.0.h:
        * ace/config-unixware-7.1.0.h:
        * ace/config-unixware-7.1.0.udk.h:
        * include/makeinclude/platform_irix6.x_common.GNU:
        * include/makeinclude/platform_irix6.x_g++.GNU:
        * include/makeinclude/platform_irix6.x_sgic++.GNU:
        * include/makeinclude/platform_tru64_cxx.GNU:
        * include/makeinclude/platform_tru64_g++.GNU:
        * include/makeinclude/platform_tru64_post.GNU:
        * include/makeinclude/platform_tru64_pre.GNU:
        * include/makeinclude/platform_unixware_g++.GNU:
          Removed the files because Tru64, Irix, Unixware, and SCO support are
          removed now

1 files changed, 19 insertions, 20 deletions

diff --git a/ACE/ace/OS_NS_netdb.inl b/ACE/ace/OS_NS_netdb.inl
index 99c4745464c..317875b620e 100644
--- a/ACE/ace/OS_NS_netdb.inl
+++ b/ACE/ace/OS_NS_netdb.inl
@@ -107,12 +107,12 @@ ACE_OS::gethostbyaddr_r (const char *addr,
   ACE_UNUSED_ARG (buffer);
   ACE_UNUSED_ARG (h_errnop);
   ACE_NOTSUP_RETURN (0);
-# elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE)
+# elif defined (ACE_HAS_REENTRANT_FUNCTIONS)
 
   if (0 == addr || '\0' == addr[0])
       return 0;
 
-#   if defined (AIX) || defined (DIGITAL_UNIX)
+#   if defined (AIX)
   ACE_OS::memset (buffer, 0, sizeof (ACE_HOSTENT_DATA));
 
   //FUZZ: disable check_for_lack_ACE_OS
@@ -206,7 +206,7 @@ ACE_OS::gethostbyaddr_r (const char *addr,
                        struct hostent *, 0);
   //FUZZ: enable check_for_lack_ACE_OS
 #     endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
-#   endif /* defined (AIX) || defined (DIGITAL_UNIX) */
+#   endif /* defined (AIX) */
 # elif defined (ACE_HAS_NONCONST_GETBY)
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buffer);
@@ -290,13 +290,12 @@ ACE_OS::gethostbyname_r (const char *name,
   ACE_UNUSED_ARG (buffer);
   ACE_UNUSED_ARG (h_errnop);
   ACE_NOTSUP_RETURN (0);
-# elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE)
+# elif defined (ACE_HAS_REENTRANT_FUNCTIONS)
 
   if (0 == name || '\0' == name[0])
       return (struct hostent *)0;
 
-#   if defined (DIGITAL_UNIX) || \
-       (defined (ACE_AIX_MINOR_VERS) && (ACE_AIX_MINOR_VERS > 2))
+# if (defined (ACE_AIX_MINOR_VERS) && (ACE_AIX_MINOR_VERS > 2))
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buffer);
   ACE_UNUSED_ARG (h_errnop);
@@ -397,7 +396,7 @@ ACE_OS::gethostbyname_r (const char *name,
                        0);
   //FUZZ: enable check_for_lack_ACE_OS
 #     endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
-#   endif /* defined (AIX) || defined (DIGITAL_UNIX) */
+#   endif /* defined (AIX) */
 # elif defined (ACE_HAS_NONCONST_GETBY)
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buffer);
@@ -421,7 +420,7 @@ ACE_OS::gethostbyname_r (const char *name,
     *h_errnop = errno;
   return result2;
   //FUZZ: enable check_for_lack_ACE_OS
-# endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) */
+# endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */
 }
 
 #endif
@@ -524,8 +523,8 @@ ACE_OS::getprotobyname_r (const char *name,
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buffer);
   ACE_NOTSUP_RETURN (0);
-#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE)
-# if defined (AIX) || defined (DIGITAL_UNIX)
+#elif defined (ACE_HAS_REENTRANT_FUNCTIONS)
+# if defined (AIX)
   //FUZZ: disable check_for_lack_ACE_OS
   if (::getprotobyname_r (name, result, (struct protoent_data *) buffer) == 0)
     return result;
@@ -561,7 +560,7 @@ ACE_OS::getprotobyname_r (const char *name,
                        struct protoent *, 0);
     //FUZZ: enable check_for_lack_ACE_OS
 #   endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
-# endif /* defined (AIX) || defined (DIGITAL_UNIX) */
+# endif /* defined (AIX) */
 #elif defined (ACE_HAS_NONCONST_GETBY)
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buffer);
@@ -578,7 +577,7 @@ ACE_OS::getprotobyname_r (const char *name,
                        struct protoent *,
                        0);
   //FUZZ: enable check_for_lack_ACE_OS
-#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) !defined (UNIXWARE) */
+#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */
 }
 
 ACE_INLINE struct protoent *
@@ -605,8 +604,8 @@ ACE_OS::getprotobynumber_r (int proto,
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buffer);
   ACE_NOTSUP_RETURN (0);
-#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE)
-# if defined (AIX) || defined (DIGITAL_UNIX)
+#elif defined (ACE_HAS_REENTRANT_FUNCTIONS)
+# if defined (AIX)
   //FUZZ: disable check_for_lack_ACE_OS
   if (::getprotobynumber_r (proto, result, (struct protoent_data *) buffer) == 0)
     return result;
@@ -639,7 +638,7 @@ ACE_OS::getprotobynumber_r (int proto,
                        struct protoent *, 0);
   //FUZZ: enable check_for_lack_ACE_OS
 #   endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
-# endif /* defined (AIX) || defined (DIGITAL_UNIX) */
+# endif /* defined (AIX) */
 #else
   ACE_UNUSED_ARG (buffer);
   ACE_UNUSED_ARG (result);
@@ -648,7 +647,7 @@ ACE_OS::getprotobynumber_r (int proto,
   ACE_SOCKCALL_RETURN (::getprotobynumber (proto),
                        struct protoent *, 0);
   //FUZZ: enable check_for_lack_ACE_OS
-#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) */
+#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */
 }
 
 ACE_INLINE struct servent *
@@ -689,8 +688,8 @@ ACE_OS::getservbyname_r (const char *svc,
   ACE_UNUSED_ARG (result);
   ACE_UNUSED_ARG (buf);
   ACE_NOTSUP_RETURN (0);
-#elif defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE)
-# if defined (AIX) || defined (DIGITAL_UNIX)
+#elif defined (ACE_HAS_REENTRANT_FUNCTIONS)
+# if defined (AIX)
   ACE_OS::memset (buf, 0, sizeof (ACE_SERVENT_DATA));
 
   //FUZZ: disable check_for_lack_ACE_OS
@@ -729,7 +728,7 @@ ACE_OS::getservbyname_r (const char *svc,
                        struct servent *, 0);
   //FUZZ: enable check_for_lack_ACE_OS
 #   endif /* ACE_LACKS_NETDB_REENTRANT_FUNCTIONS */
-# endif /* defined (AIX) || defined (DIGITAL_UNIX) */
+# endif /* defined (AIX) */
 #elif defined (ACE_HAS_NONCONST_GETBY)
   ACE_UNUSED_ARG (buf);
   ACE_UNUSED_ARG (result);
@@ -748,7 +747,7 @@ ACE_OS::getservbyname_r (const char *svc,
                        struct servent *,
                        0);
   //FUZZ: enable check_for_lack_ACE_OS
-#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) && !defined (UNIXWARE) */
+#endif /* defined (ACE_HAS_REENTRANT_FUNCTIONS) */
 }
 
 ACE_END_VERSIONED_NAMESPACE_DECL