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, 1 insertions, 13 deletions

diff --git a/ACE/ace/OS_NS_time.inl b/ACE/ace/OS_NS_time.inl
index 3fbbb3a7f98..9945f739c68 100644
--- a/ACE/ace/OS_NS_time.inl
+++ b/ACE/ace/OS_NS_time.inl
@@ -28,12 +28,8 @@ ACE_OS::asctime_r (const struct tm *t, char *buf, int buflen)
   ACE_OS_TRACE ("ACE_OS::asctime_r");
 #if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 # if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R)
-  char *result;
-#   if defined (DIGITAL_UNIX)
-  ACE_OSCALL (::_Pasctime_r (t, buf), char *, 0, result);
-#   else
+  char *result = 0;
   ACE_OSCALL (::asctime_r (t, buf), char *, 0, result);
-#   endif /* DIGITAL_UNIX */
   ACE_OS::strsncpy (buf, result, buflen);
   return buf;
 # else
@@ -147,11 +143,7 @@ ACE_OS::ctime_r (const time_t *t, ACE_TCHAR *buf, int buflen)
       return 0;
     }
 #   if defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R)
-#      if defined (DIGITAL_UNIX)
-  ACE_OSCALL (::_Pctime_r (t, bufp), ACE_TCHAR *, 0, bufp);
-#      else /* DIGITAL_UNIX */
   ACE_OSCALL (::ctime_r (t, bufp), char *, 0, bufp);
-#      endif /* DIGITAL_UNIX */
 #   else /* ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R */
 
 #      if defined (ACE_HAS_SIZET_PTR_ASCTIME_R_AND_CTIME_R)
@@ -369,11 +361,7 @@ ACE_OS::gmtime_r (const time_t *t, struct tm *res)
 {
   ACE_OS_TRACE ("ACE_OS::gmtime_r");
 #if defined (ACE_HAS_REENTRANT_FUNCTIONS)
-# if defined (DIGITAL_UNIX)
-  ACE_OSCALL_RETURN (::_Pgmtime_r (t, res), struct tm *, 0);
-# else
   ACE_OSCALL_RETURN (::gmtime_r (t, res), struct tm *, 0);
-# endif /* DIGITAL_UNIX */
 #elif defined (ACE_HAS_TR24731_2005_CRT)
   struct tm *tm_p = res;
   ACE_SECURECRTCALL (gmtime_s (res, t), struct tm *, 0, tm_p);