Mon Dec 3 10:02:54 UTC 2007 Johnny Willemsen <jwillemsen@remedy.nl>

44 files changed, 156 insertions, 603 deletions

diff --git a/ACE/ChangeLog b/ACE/ChangeLog
index 041ad5193bb..1852df862d4 100644
--- a/ACE/ChangeLog
+++ b/ACE/ChangeLog
@@ -1,3 +1,84 @@
+Mon Dec  3 10:02:54 UTC 2007  Johnny Willemsen  <jwillemsen@remedy.nl>
+
+        * ace/config-aix-5.x.h:
+        * ace/config-cray.h:
+        * ace/config-cygwin32.h:
+        * ace/config-hpux-11.00.h:
+        * ace/config-integritySCA.h:
+        * ace/config-irix6.x-common.h:
+        * ace/config-linux.h:
+        * ace/config-macosx-leopard.h:
+        * ace/config-macosx-panther.h:
+        * ace/config-macosx-tiger.h:
+        * ace/config-macosx.h:
+        * ace/config-netbsd.h:
+        * ace/config-openvms.h:
+        * ace/config-posix.h:
+        * ace/config-qnx-neutrino.h:
+        * ace/config-qnx-rtp-62x.h:
+        * ace/config-qnx-rtp-pre62x.h:
+        * ace/config-rtems.h:
+        * ace/config-sunos5.5.h:
+        * ace/config-unixware-7.1.0.h:
+        * ace/config-unixware-7.1.0.udk.h:
+        * ace/config-vxworks5.x.h:
+        * ace/config-vxworks6.2.h:
+        * ace/config-vxworks6.3.h:
+        * ace/config-vxworks6.4.h:
+        * ace/config-win32-interix.h:
+          Removed ACE_HAS_PTHREADS_STD, we only support the official pthread
+          standard, not any draft
+
+        * ace/config-cray.h:
+          Removed support for Unicos 9 and earlier. So far as I can find on the web
+          unicos 9 is from 1997
+
+        * ace/config-mvs.h:
+          Removed draft6, according to references on the web the std
+          pthread is supported now
+
+        * ace/config-tandem-nsk-mips-v2.h:
+        * ace/config-tandem-nsk-mips-v3.h:
+          Newer NSK versions to support pthread std
+
+        * ace/config-tru64.h:
+          Removed support for ancient tru64 versions
+
+        * ace/os_include/os_limits.h:
+          Updated for VxWorks 6.6.
+
+        * ace/os_include/os_pthread.h:
+          Removed support for the draft pthread mappings
+
+        * ace/os_include/os_time.h:
+          Use ACE_HAS_PTHREADS
+
+        * ace/os_include/sys/os_msg.h:
+          Removed not needed workaround for osf1
+
+        * ace/OS_NS_pwd.inl:
+        * ace/OS_NS_signal.inl:
+          Use ACE_HAS_PTHREADS
+
+        * ace/OS_NS_string.cpp:
+          Initialise pointer with 0
+
+        * ace/OS_NS_Thread.cpp:
+        * ace/OS_NS_Thread.inl:
+        * ace/Thread_Manager.cpp:
+          Removed support for pthread draft 4, 6, & 7
+
+        * ace/Recursive_Thread_Mutex.cpp:
+          get_nesting_level is only not support with VxWorks tasks
+
+        * ace/Select_Reactor_Base.cpp:
+          Layout change
+
+        * ace/Token.h:
+          Only with VxWorks tasks use semaphores
+
+        * ace/WIN32_Asynch_IO.cpp
+
 Sun Dec  2 17:47:13 UTC 2007  J.T. Conklin  <jtc@acorntoolworks.com>
 
         * configure.ac:
diff --git a/ACE/ace/OS_NS_Thread.cpp b/ACE/ace/OS_NS_Thread.cpp
index 6f0c833709d..e23aa2dcf9d 100644
--- a/ACE/ace/OS_NS_Thread.cpp
+++ b/ACE/ace/OS_NS_Thread.cpp
@@ -168,8 +168,7 @@ ACE_TSS_Emulation::tss_base (void* ts_storage[], u_int *ts_created)
     }
 
   // Check to see if this is the first time in for this thread.
-  // This block can also be entered after a fork () in the child process,
-  // at least on Pthreads Draft 4 platforms.
+  // This block can also be entered after a fork () in the child process.
   if (old_ts_storage == 0)
     {
       if (ts_created)
@@ -1811,49 +1810,33 @@ ACE_OS::mutex_init (ACE_mutex_t *m,
   // wasn't originally set.
   if (attributes == &l_attributes)
   {
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-      if (::pthread_mutexattr_create (attributes) == 0)
-#   elif defined (ACE_HAS_PTHREADS_DRAFT7) || defined (ACE_HAS_PTHREADS_STD)
       if (ACE_ADAPT_RETVAL (::pthread_mutexattr_init (attributes), result) == 0)
-#   else /* draft 6 */
-      if (::pthread_mutexattr_init (attributes) == 0)
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
-{
-  result = 0;
-  attr_init = 1; // we have initialized these attributes
-}
+        {
+          result = 0;
+          attr_init = 1; // we have initialized these attributes
+        }
       else
-        result = -1;        // ACE_ADAPT_RETVAL used it for intermediate status
+        {
+          result = -1;        // ACE_ADAPT_RETVAL used it for intermediate status
+        }
   }
 
   if (result == 0 && lock_scope != 0)
 {
-#   if defined (ACE_HAS_PTHREADS_DRAFT7) || defined (ACE_HAS_PTHREADS_STD)
 #     if defined (_POSIX_THREAD_PROCESS_SHARED) && !defined (ACE_LACKS_MUTEXATTR_PSHARED)
       (void) ACE_ADAPT_RETVAL (::pthread_mutexattr_setpshared (attributes,
                                                                lock_scope),
                                result);
 #     endif /* _POSIX_THREAD_PROCESS_SHARED && !ACE_LACKS_MUTEXATTR_PSHARED */
-#   else /* Pthreads draft 6 */
-#     if !defined (ACE_LACKS_MUTEXATTR_PSHARED)
-      if (::pthread_mutexattr_setpshared (attributes, lock_scope) != 0)
-        result = -1;
-#     endif /* ACE_LACKS_MUTEXATTR_PSHARED */
-#   endif /* ACE_HAS_PTHREADS_DRAFT7 || ACE_HAS_PTHREADS_STD */
 }
 
   if (result == 0 && lock_type != 0)
 {
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-#     if defined (ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP)
-      if (::pthread_mutexattr_setkind_np (attributes, lock_type) != 0)
-        result = -1;
-#     endif /* ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP */
-#   elif defined (ACE_HAS_RECURSIVE_MUTEXES)
+#   if defined (ACE_HAS_RECURSIVE_MUTEXES)
       (void) ACE_ADAPT_RETVAL (::pthread_mutexattr_settype (attributes,
                                                             lock_type),
                                result);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
+#   endif /* ACE_HAS_RECURSIVE_MUTEXES */
 }
 
   if (result == 0)
@@ -1868,13 +1851,7 @@ ACE_OS::mutex_init (ACE_mutex_t *m,
        */
       ACE_OS::memset (m, 0, sizeof (*m));
 #   endif
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-      if (::pthread_mutex_init (m, *attributes) == 0)
-#   elif defined (ACE_HAS_PTHREADS_DRAFT7) || defined (ACE_HAS_PTHREADS_STD)
       if (ACE_ADAPT_RETVAL (::pthread_mutex_init (m, attributes), result) == 0)
-#   else
-      if (::pthread_mutex_init (m, attributes) == 0)
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
         result = 0;
       else
         result = -1;        // ACE_ADAPT_RETVAL used it for intermediate status
@@ -1883,11 +1860,7 @@ ACE_OS::mutex_init (ACE_mutex_t *m,
   // Only do the deletions if the <attributes> parameter wasn't
   // originally set.
   if (attributes == &l_attributes && attr_init)
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-  ::pthread_mutexattr_delete (&l_attributes);
-#   else
-  ::pthread_mutexattr_destroy (&l_attributes);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
+    ::pthread_mutexattr_destroy (&l_attributes);
 
   return result;
 # elif defined (ACE_HAS_STHREADS)
@@ -1966,13 +1939,9 @@ ACE_OS::mutex_destroy (ACE_mutex_t *m)
   ACE_OS_TRACE ("ACE_OS::mutex_destroy");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
-#   if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6))
-  ACE_OSCALL_RETURN (::pthread_mutex_destroy (m), int, -1);
-#   else
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_mutex_destroy (m),
                      result), int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6*/
 # elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_destroy (m), result), int, -1);
@@ -2051,13 +2020,9 @@ ACE_OS::mutex_lock (ACE_mutex_t *m)
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
   // Note, don't use "::" here since the following call is often a macro.
-#   if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6))
-  ACE_OSCALL_RETURN (pthread_mutex_lock (m), int, -1);
-#   else
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_lock (m), result),
                      int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 # elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_lock (m), result), int, -1);
@@ -2230,20 +2195,9 @@ ACE_OS::mutex_trylock (ACE_mutex_t *m)
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
   // Note, don't use "::" here since the following call is often a macro.
-#   if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6))
-  int status = pthread_mutex_trylock (m);
-  if (status == 1)
-    status = 0;
-  else if (status == 0) {
-    status = -1;
-    errno = EBUSY;
-  }
-  return status;
-#   else
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_trylock (m), result),
                      int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 # elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_trylock (m), result), int, -1);
@@ -2343,13 +2297,9 @@ ACE_OS::mutex_unlock (ACE_mutex_t *m)
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
   // Note, don't use "::" here since the following call is often a macro.
-#   if (defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6))
-  ACE_OSCALL_RETURN (pthread_mutex_unlock (m), int, -1);
-#   else
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_mutex_unlock (m), result),
                      int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 # elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::mutex_unlock (m), result), int, -1);
@@ -3546,18 +3496,12 @@ ACE_OS::sched_params (const ACE_Sched_Params &sched_params,
     {
       ACE_thread_t thr_id = ACE_OS::thr_self ();
 
-# if defined (ACE_HAS_PTHREADS_DRAFT4)
-      return (::pthread_setscheduler (thr_id,
-                                      sched_params.policy (),
-                                      sched_params.priority()) == -1 ? -1 : 0);
-# else
       int result;
       ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_setschedparam (thr_id,
                                                                     sched_params.policy (),
                                                                     &param),
                                            result),
                          int, -1);
-# endif  /* ACE_HAS_PTHREADS_DRAFT4 */
     }
 # if defined (sun)
   // We need to be able to set LWP priorities on Suns, even without
@@ -3890,12 +3834,8 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 #   else
   pthread_attr_t attr;
 #   endif
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-  if (ACE_ADAPT_RETVAL(::pthread_attr_create (&attr), result) != 0)
-#   else /* ACE_HAS_PTHREADS_DRAFT4 */
   if (ACE_ADAPT_RETVAL(::pthread_attr_init(&attr), result) != 0)
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
-      return -1;
+    return -1;
 
   if (stacksize != 0)
     {
@@ -3907,28 +3847,20 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 #   endif /* PTHREAD_STACK_MIN */
 
 #   if !defined (ACE_LACKS_PTHREAD_ATTR_SETSTACKSIZE)
-#     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-      if (::pthread_attr_setstacksize (&attr, size) != 0)
+#     if !defined (ACE_LACKS_PTHREAD_ATTR_SETSTACK)
+      int result;
+      if (stack != 0)
+        result = ACE_ADAPT_RETVAL (pthread_attr_setstack (&attr, stack, size), result);
+      else
+        result = ACE_ADAPT_RETVAL (pthread_attr_setstacksize (&attr, size), result);
+      if (result == -1)
 #     else
-#       if !defined (ACE_LACKS_PTHREAD_ATTR_SETSTACK)
-        int result;
-        if (stack != 0)
-          result = ACE_ADAPT_RETVAL (pthread_attr_setstack (&attr, stack, size), result);
-        else
-          result = ACE_ADAPT_RETVAL (pthread_attr_setstacksize (&attr, size), result);
-        if (result == -1)
-#       else
-        if (ACE_ADAPT_RETVAL (pthread_attr_setstacksize (&attr, size), result) == -1)
-#       endif /* !ACE_LACKS_PTHREAD_ATTR_SETSTACK */
-#     endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
-          {
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-            ::pthread_attr_delete (&attr);
-#     else /* ACE_HAS_PTHREADS_DRAFT4 */
-            ::pthread_attr_destroy (&attr);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
-            return -1;
-          }
+      if (ACE_ADAPT_RETVAL (pthread_attr_setstacksize (&attr, size), result) == -1)
+#     endif /* !ACE_LACKS_PTHREAD_ATTR_SETSTACK */
+        {
+          ::pthread_attr_destroy (&attr);
+          return -1;
+        }
 #   else
       ACE_UNUSED_ARG (size);
 #   endif /* !ACE_LACKS_PTHREAD_ATTR_SETSTACKSIZE */
@@ -3941,11 +3873,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
     {
       if (ACE_ADAPT_RETVAL(::pthread_attr_setstackaddr (&attr, stack), result) != 0)
         {
-#       if defined (ACE_HAS_PTHREADS_DRAFT4)
-          ::pthread_attr_delete (&attr);
-#       else /* ACE_HAS_PTHREADS_DRAFT4 */
           ::pthread_attr_destroy (&attr);
-#       endif /* ACE_HAS_PTHREADS_DRAFT4 */
           return -1;
         }
     }
@@ -3967,24 +3895,12 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
           if (ACE_BIT_ENABLED (flags, THR_DETACHED))
             dstate = PTHREAD_CREATE_DETACHED;
 
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-          if (::pthread_attr_setdetach_np (&attr, dstate) != 0)
-#     else /* ACE_HAS_PTHREADS_DRAFT4 */
-#       if defined (ACE_HAS_PTHREADS_DRAFT6)
-            if (::pthread_attr_setdetachstate (&attr, &dstate) != 0)
-#       else
-              if (ACE_ADAPT_RETVAL(::pthread_attr_setdetachstate (&attr, dstate),
-                                   result) != 0)
-#       endif /* ACE_HAS_PTHREADS_DRAFT6 */
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
-                {
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-                  ::pthread_attr_delete (&attr);
-#     else /* ACE_HAS_PTHREADS_DRAFT4 */
-                  ::pthread_attr_destroy (&attr);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
-                  return -1;
-                }
+          if (ACE_ADAPT_RETVAL(::pthread_attr_setdetachstate (&attr, dstate),
+                               result) != 0)
+            {
+              ::pthread_attr_destroy (&attr);
+              return -1;
+            }
         }
 
       // Note: if ACE_LACKS_SETDETACH and THR_DETACHED is enabled, we
@@ -4042,27 +3958,17 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 
 #     endif /* ACE_HAS_ONLY_SCHED_OTHER */
 
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-          result = ::pthread_attr_setsched (&attr, spolicy);
-#     elif defined (ACE_HAS_PTHREADS_DRAFT6)
-          result = ::pthread_attr_setschedpolicy (&attr, spolicy);
-#     else  /* draft 7 or std */
           (void) ACE_ADAPT_RETVAL(::pthread_attr_setschedpolicy (&attr, spolicy),
                            result);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
           if (result != 0)
             {
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-              ::pthread_attr_delete (&attr);
-#     else /* ACE_HAS_PTHREADS_DRAFT4 */
               ::pthread_attr_destroy (&attr);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
               return -1;
             }
         }
 
       // *** Set Priority (use reasonable default priorities)
-#     if defined(ACE_HAS_PTHREADS_STD)
+#     if defined(ACE_HAS_PTHREADS)
       // If we wish to explicitly set a scheduling policy, we also
       // have to specify a priority.  We choose a "middle" priority as
       // default.  Maybe this is also necessary on other POSIX'ish
@@ -4079,7 +3985,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
           else // THR_SCHED_DEFAULT
             priority = ACE_THR_PRI_OTHER_DEF;
         }
-#     endif /* ACE_HAS_PTHREADS_STD */
+#     endif /* ACE_HAS_PTHREADS */
       if (priority != ACE_DEFAULT_THREAD_PRIORITY)
         {
           struct sched_param sparam;
@@ -4088,10 +3994,10 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 #     if defined (ACE_HAS_IRIX62_THREADS)
           sparam.sched_priority = ACE_MIN (priority,
                                            (long) PTHREAD_MAX_PRIORITY);
-#     elif defined (PTHREAD_MAX_PRIORITY) && !defined(ACE_HAS_PTHREADS_STD)
+#     elif defined (PTHREAD_MAX_PRIORITY) && !defined(ACE_HAS_PTHREADS)
           /* For MIT pthreads... */
           sparam.prio = ACE_MIN (priority, PTHREAD_MAX_PRIORITY);
-#     elif defined(ACE_HAS_PTHREADS_STD) && !defined (ACE_HAS_STHREADS)
+#     elif defined(ACE_HAS_PTHREADS) && !defined (ACE_HAS_STHREADS)
           // The following code forces priority into range.
           if (ACE_BIT_ENABLED (flags, THR_SCHED_FIFO))
             sparam.sched_priority =
@@ -4120,20 +4026,11 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
             if (priority > 0)
 #       endif /* sun && ACE_HAS_ONLY_SCHED_OTHER */
               {
-#       if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-                result = ::pthread_attr_setprio (&attr,
-                                                 sparam.sched_priority);
-#       else /* this is draft 7 or std */
                 (void) ACE_ADAPT_RETVAL(::pthread_attr_setschedparam (&attr, &sparam),
                                         result);
-#       endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
                 if (result != 0)
                   {
-#       if defined (ACE_HAS_PTHREADS_DRAFT4)
-                    ::pthread_attr_delete (&attr);
-#       else /* ACE_HAS_PTHREADS_DRAFT4 */
                     ::pthread_attr_destroy (&attr);
-#       endif /* ACE_HAS_PTHREADS_DRAFT4 */
                     return -1;
                   }
               }
@@ -4144,20 +4041,12 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
       if (ACE_BIT_ENABLED (flags, THR_INHERIT_SCHED)
           || ACE_BIT_ENABLED (flags, THR_EXPLICIT_SCHED))
         {
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-          int sched = PTHREAD_DEFAULT_SCHED;
-#     else /* ACE_HAS_PTHREADS_DRAFT4 */
           int sched = PTHREAD_EXPLICIT_SCHED;
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
           if (ACE_BIT_ENABLED (flags, THR_INHERIT_SCHED))
             sched = PTHREAD_INHERIT_SCHED;
           if (ACE_ADAPT_RETVAL(::pthread_attr_setinheritsched (&attr, sched), result) != 0)
             {
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-              ::pthread_attr_delete (&attr);
-#     else /* ACE_HAS_PTHREADS_DRAFT4 */
               ::pthread_attr_destroy (&attr);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
               return -1;
             }
         }
@@ -4171,11 +4060,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
     {
       if (ACE_ADAPT_RETVAL(::pthread_attr_setname (&attr, const_cast<char*>(*thr_name)), result) != 0)
         {
-#       if defined (ACE_HAS_PTHREADS_DRAFT4)
-          ::pthread_attr_delete (&attr);
-#       else /* ACE_HAS_PTHREADS_DRAFT4 */
           ::pthread_attr_destroy (&attr);
-#       endif /* ACE_HAS_PTHREADS_DRAFT4 */
           return -1;
         }
     }
@@ -4201,11 +4086,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 
           if (ACE_ADAPT_RETVAL(::pthread_attr_setscope (&attr, scope), result) != 0)
             {
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-              ::pthread_attr_delete (&attr);
-#     else /* ACE_HAS_PTHREADS_DRAFT4 */
               ::pthread_attr_destroy (&attr);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
               return -1;
             }
         }
@@ -4217,11 +4098,7 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
            if (ACE_ADAPT_RETVAL(::pthread_attr_setcreatesuspend_np(&attr), result) != 0)
             {
 
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-              ::pthread_attr_delete (&attr);
-#     else /* ACE_HAS_PTHREADS_DRAFT4 */
               ::pthread_attr_destroy (&attr);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
               return -1;
             }
         }
@@ -4257,29 +4134,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
 #   endif /* ! ACE_LACKS_THR_CONCURRENCY_FUNCS */
     }
 
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-  ACE_OSCALL (::pthread_create (thr_id, attr,
-                                thread_args->entry_point (),
-                                thread_args),
-              int, -1, result);
-
-#     if defined (ACE_LACKS_SETDETACH)
-  if (ACE_BIT_ENABLED (flags, THR_DETACHED))
-    {
-      ::pthread_detach (thr_id);
-    }
-#     endif /* ACE_LACKS_SETDETACH */
-
-  ::pthread_attr_delete (&attr);
-
-#   elif defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL (::pthread_create (thr_id, &attr,
-                                thread_args->entry_point (),
-                                thread_args),
-              int, -1, result);
-  ::pthread_attr_destroy (&attr);
-
-#   else /* this is draft 7 or std */
   ACE_OSCALL (ACE_ADAPT_RETVAL (::pthread_create (thr_id,
                                                   &attr,
                                                   thread_args->entry_point (),
@@ -4287,7 +4141,6 @@ ACE_OS::thr_create (ACE_THR_FUNC func,
                                 result),
               int, -1, result);
   ::pthread_attr_destroy (&attr);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
 
   // This is a SunOS or POSIX implementation of pthreads, where we
   // assume that ACE_thread_t and ACE_hthread_t are the same.  If this
@@ -4851,21 +4704,10 @@ ACE_OS::thr_keycreate_native (ACE_OS_thread_key_t *key,
   // ACE_OS_TRACE ("ACE_OS::thr_keycreate_native");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
-
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-#       if defined (ACE_HAS_STDARG_THR_DEST)
-    ACE_OSCALL_RETURN (::pthread_keycreate (key, (void (*)(...)) dest), int, -1);
-#       else  /* ! ACE_HAS_STDARG_THR_DEST */
-    ACE_OSCALL_RETURN (::pthread_keycreate (key, dest), int, -1);
-#       endif /* ! ACE_HAS_STDARG_THR_DEST */
-#     elif defined (ACE_HAS_PTHREADS_DRAFT6)
-    ACE_OSCALL_RETURN (::pthread_key_create (key, dest), int, -1);
-#     else
     int result;
     ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_key_create (key, dest),
                                          result),
                        int, -1);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
 #   elif defined (ACE_HAS_STHREADS)
     int result;
     ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_keycreate (key, dest),
@@ -4964,10 +4806,7 @@ ACE_OS::thr_keyfree_native (ACE_OS_thread_key_t key)
     // after libACE has been actually been unmapped from memory.
     (void) ACE_OS::thr_setspecific (key, 0);
 #   endif /* ACE_HAS_BROKEN_THREAD_KEYFREE */
-#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-    ACE_UNUSED_ARG (key);
-    ACE_NOTSUP_RETURN (-1);
-#   elif defined (ACE_HAS_PTHREADS)
+#   if defined (ACE_HAS_PTHREADS)
     return ::pthread_key_delete (key);
 #   elif defined (ACE_HAS_THR_KEYDELETE)
     return ::thr_keydelete (key);
@@ -5069,15 +4908,10 @@ ACE_OS::thr_setspecific_native (ACE_OS_thread_key_t key, void *data)
   // ACE_OS_TRACE ("ACE_OS::thr_setspecific_native");
 #   if defined (ACE_HAS_THREADS)
 #     if defined (ACE_HAS_PTHREADS)
-#      if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-    ACE_OSCALL_RETURN (::pthread_setspecific (key, data), int, -1);
-#       else
-    int result;
-    ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setspecific (key, data),
-                                         result),
-                       int, -1);
-#       endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
-
+      int result;
+      ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setspecific (key, data),
+                                           result),
+                         int, -1);
 #     elif defined (ACE_HAS_STHREADS)
       int result;
       ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setspecific (key, data), result), int, -1);
diff --git a/ACE/ace/OS_NS_Thread.inl b/ACE/ace/OS_NS_Thread.inl
index 94cbe373e84..3d183bb83ab 100644
--- a/ACE/ace/OS_NS_Thread.inl
+++ b/ACE/ace/OS_NS_Thread.inl
@@ -132,11 +132,7 @@ ACE_OS::condattr_destroy (ACE_condattr_t &attributes)
 #if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
 
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-  pthread_condattr_delete (&attributes);
-#     else
   pthread_condattr_destroy (&attributes);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
 
 #   elif defined (ACE_HAS_STHREADS)
   attributes.type = 0;
@@ -166,23 +162,11 @@ ACE_OS::condattr_init (ACE_condattr_t &attributes,
       ACE_OS::memset (&attributes, 0, sizeof (attributes));
 #   endif
   if (
-#     if defined  (ACE_HAS_PTHREADS_DRAFT4)
-      pthread_condattr_create (&attributes) == 0
-#     elif defined (ACE_HAS_PTHREADS_STD) || defined (ACE_HAS_PTHREADS_DRAFT7)
       ACE_ADAPT_RETVAL (pthread_condattr_init (&attributes), result) == 0
 #       if defined (_POSIX_THREAD_PROCESS_SHARED) && !defined (ACE_LACKS_CONDATTR_PSHARED)
       && ACE_ADAPT_RETVAL (pthread_condattr_setpshared (&attributes, type),
                            result) == 0
 #       endif /* _POSIX_THREAD_PROCESS_SHARED && ! ACE_LACKS_CONDATTR_PSHARED */
-#     else  /* this is draft 6 */
-      pthread_condattr_init (&attributes) == 0
-#       if !defined (ACE_LACKS_CONDATTR_PSHARED)
-      && pthread_condattr_setpshared (&attributes, type) == 0
-#       endif /* ACE_LACKS_CONDATTR_PSHARED */
-#       if defined (ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP)
-      && pthread_condattr_setkind_np (&attributes, type) == 0
-#       endif /* ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP */
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
       )
      result = 0;
   else
@@ -214,14 +198,10 @@ ACE_OS::cond_broadcast (ACE_cond_t *cv)
   ACE_OS_TRACE ("ACE_OS::cond_broadcast");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
-#     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL_RETURN (pthread_cond_broadcast (cv), int, -1);
-#     else
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_broadcast (cv),
                                        result),
                      int, -1);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 #   elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_broadcast (cv),
@@ -240,12 +220,8 @@ ACE_OS::cond_destroy (ACE_cond_t *cv)
   ACE_OS_TRACE ("ACE_OS::cond_destroy");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
-#     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL_RETURN (pthread_cond_destroy (cv), int, -1);
-#     else
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_destroy (cv), result), int, -1);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 #   elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_destroy (cv), result), int, -1);
@@ -279,15 +255,7 @@ ACE_OS::cond_init (ACE_cond_t *cv,
   ACE_OS::memset (cv, 0, sizeof (*cv));
 #     endif
 
-  if (
-#     if defined  (ACE_HAS_PTHREADS_DRAFT4)
-      pthread_cond_init (cv, attributes) == 0
-#     elif defined (ACE_HAS_PTHREADS_STD) || defined (ACE_HAS_PTHREADS_DRAFT7)
-      ACE_ADAPT_RETVAL (pthread_cond_init (cv, &attributes), result) == 0
-#     else  /* this is draft 6 */
-      pthread_cond_init (cv, &attributes) == 0
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
-      )
+  if (ACE_ADAPT_RETVAL (pthread_cond_init (cv, &attributes), result) == 0)
      result = 0;
   else
      result = -1;       // ACE_ADAPT_RETVAL used it for intermediate status
@@ -335,13 +303,9 @@ ACE_OS::cond_signal (ACE_cond_t *cv)
   ACE_OS_TRACE ("ACE_OS::cond_signal");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
-#     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL_RETURN (pthread_cond_signal (cv), int, -1);
-#     else
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_signal (cv), result),
                      int, -1);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 #   elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_signal (cv), result), int, -1);
@@ -359,13 +323,9 @@ ACE_OS::cond_wait (ACE_cond_t *cv,
   ACE_OS_TRACE ("ACE_OS::cond_wait");
 # if defined (ACE_HAS_THREADS)
 #   if defined (ACE_HAS_PTHREADS)
-#     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_OSCALL_RETURN (pthread_cond_wait (cv, external_mutex), int, -1);
-#     else
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_cond_wait (cv, external_mutex), result),
                      int, -1);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 #   elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::cond_wait (cv, external_mutex), result),
@@ -393,25 +353,12 @@ ACE_OS::cond_timedwait (ACE_cond_t *cv,
 
 #   if defined (ACE_HAS_PTHREADS)
 
-#     if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  if (timeout == 0)
-    ACE_OSCALL (pthread_cond_wait (cv, external_mutex),
-                int, -1, result);
-  else
-    {
-      ACE_OSCALL (pthread_cond_timedwait (cv, external_mutex,
-                                            (ACE_TIMESPEC_PTR) &ts),
-                  int, -1, result);
-    }
-
-#     else
   ACE_OSCALL (ACE_ADAPT_RETVAL (timeout == 0
                                 ? pthread_cond_wait (cv, external_mutex)
                                 : pthread_cond_timedwait (cv, external_mutex,
                                                             (ACE_TIMESPEC_PTR) &ts),
                                 result),
               int, -1, result);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6*/
   // We need to adjust this to make the POSIX and Solaris return
   // values consistent.  EAGAIN is from Pthreads DRAFT4 (HP-UX 10.20 and down)
   if (result == -1 &&
@@ -2561,10 +2508,7 @@ ACE_OS::sigwait (sigset_t *sset, int *sig)
       errno = ::_Psigwait (sset, sig);
       return errno == 0  ?  *sig  :  -1;
 #   else /* ! __Lynx __ && ! (DIGITAL_UNIX && __DECCXX_VER) */
-#     if (defined (ACE_HAS_PTHREADS_DRAFT4) || (defined (ACE_HAS_PTHREADS_DRAFT6))) || (defined (_UNICOS) && _UNICOS == 9)
-        *sig = ::sigwait (sset);
-        return *sig;
-#     elif defined (CYGWIN32)
+#     if defined (CYGWIN32)
         // Cygwin has sigwait definition, but it is not implemented
         ACE_UNUSED_ARG (sset);
         ACE_NOTSUP_RETURN (-1);
@@ -2574,7 +2518,7 @@ ACE_OS::sigwait (sigset_t *sset, int *sig)
 #     else   /* this is draft 7 or std */
         errno = ::sigwait (sset, sig);
         return errno == 0  ?  *sig  :  -1;
-#     endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
+#     endif /* CYGWIN32 */
 #   endif /* ! __Lynx__ && ! (DIGITAL_UNIX && __DECCXX_VER) */
 # elif defined (ACE_HAS_WTHREADS)
     ACE_UNUSED_ARG (sset);
@@ -2616,14 +2560,6 @@ ACE_OS::thr_cancel (ACE_thread_t thr_id)
   ACE_OS_TRACE ("ACE_OS::thr_cancel");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
-#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-#     ifdef pthread_cancel
-        // If it's a macro we can't say "pthread_cancel"...
-        ACE_OSCALL_RETURN (pthread_cancel (thr_id), int, -1);
-#     else
-        ACE_OSCALL_RETURN (pthread_cancel (thr_id), int, -1);
-#     endif /* pthread_cancel */
-#   else
   int result;
 #     ifdef pthread_cancel
         // If it's a macro we can't say "pthread_cancel"...
@@ -2635,7 +2571,6 @@ ACE_OS::thr_cancel (ACE_thread_t thr_id)
                                              result),
                            int, -1);
 #     endif /* pthread_cancel */
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 */
 # elif defined (ACE_HAS_VXTHREADS)
   ACE_OSCALL_RETURN (::taskDelete (thr_id), int, -1);
 # else /* Could be ACE_HAS_PTHREADS && ACE_LACKS_PTHREAD_CANCEL */
@@ -2734,26 +2669,6 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy)
 # if (defined (ACE_HAS_PTHREADS) && \
      (!defined (ACE_LACKS_SETSCHED) || defined (ACE_HAS_PTHREAD_SCHEDPARAM)))
 
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-  int const result = pthread_getprio (ht_id);
-  if (result != -1)
-    {
-      priority = result;
-      return 0;
-    }
-  else
-    return -1;
-#   elif defined (ACE_HAS_PTHREADS_DRAFT6)
-
-  pthread_attr_t  attr;
-  if (pthread_getschedattr (ht_id, &attr) == 0)
-    {
-      priority = pthread_attr_getprio (&attr);
-      return 0;
-    }
-  return -1;
-#   else
-
   struct sched_param param;
   int result;
 
@@ -2762,7 +2677,6 @@ ACE_OS::thr_getprio (ACE_hthread_t ht_id, int &priority, int &policy)
               -1, result);
   priority = param.sched_priority;
   return result;
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
 # elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getprio (ht_id, &priority), result), int, -1);
@@ -2817,12 +2731,8 @@ ACE_OS::thr_getspecific_native (ACE_OS_thread_key_t key, void **data)
 {
 //  ACE_OS_TRACE ("ACE_OS::thr_getspecific_native");
 # if defined (ACE_HAS_PTHREADS)
-#  if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-    return pthread_getspecific (key, data);
-#  else /* this is ACE_HAS_PTHREADS_DRAFT7 or STD */
     *data = pthread_getspecific (key);
     return 0;
-#  endif       /*  ACE_HAS_PTHREADS */
 # elif defined (ACE_HAS_STHREADS)
     int result;
     ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_getspecific (key, data), result), int, -1);
@@ -2886,29 +2796,9 @@ ACE_OS::thr_join (ACE_hthread_t thr_handle,
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_join (thr_handle, 0, status), result),
                      int, -1);
 # elif defined (ACE_HAS_PTHREADS)
-#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-  int ace_result;
-#     if defined (ACE_LACKS_NULL_PTHREAD_STATUS)
-  void *temp;
-  ACE_OSCALL (pthread_join (thr_handle,
-                              status == 0  ?  &temp  :  status),
-              int, -1, ace_result);
-#     else
-  ACE_OSCALL (pthread_join (thr_handle, status), int, -1, ace_result);
-#     endif /* ACE_LACKS_NULL_PTHREAD_STATUS */
-  // Joinable threads need to be detached after joining on Pthreads
-  // draft 4 (at least) to reclaim thread storage.
-#     if defined (ACE_HAS_PTHREADS_DRAFT4)
-  pthread_detach (&thr_handle);
-#     endif /* ACE_HAS_PTHREADS_DRAFT4 */
-
-    return ace_result;
-
-#   else
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_join (thr_handle, status), result),
                      int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
 # elif defined (ACE_HAS_WTHREADS)
   ACE_THR_FUNC_RETURN local_status = 0;
 
@@ -2949,19 +2839,9 @@ ACE_OS::thr_join (ACE_thread_t waiter_id,
                      int, -1);
 # elif defined (ACE_HAS_PTHREADS)
   ACE_UNUSED_ARG (thr_id);
-#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6)
-#     if defined (ACE_LACKS_NULL_PTHREAD_STATUS)
-  void *temp;
-  ACE_OSCALL_RETURN (pthread_join (waiter_id,
-    status == 0  ?  &temp  :  status), int, -1);
-#     else
-  ACE_OSCALL_RETURN (pthread_join (waiter_id, status), int, -1);
-#     endif
-#   else
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_join (waiter_id, status), result),
                      int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */
 # elif defined (ACE_HAS_WTHREADS)
   ACE_UNUSED_ARG (waiter_id);
   ACE_UNUSED_ARG (thr_id);
@@ -2986,7 +2866,7 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum)
   ACE_OS_TRACE ("ACE_OS::thr_kill");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
-#   if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_LACKS_PTHREAD_KILL)
+#   if defined (ACE_LACKS_PTHREAD_KILL)
   ACE_UNUSED_ARG (signum);
   ACE_UNUSED_ARG (thr_id);
   ACE_NOTSUP_RETURN (-1);
@@ -2995,7 +2875,7 @@ ACE_OS::thr_kill (ACE_thread_t thr_id, int signum)
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_kill (thr_id, signum),
                                        result),
                      int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
+#   endif /* ACE_LACKS_PTHREAD_KILL */
 # elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_kill (thr_id, signum),
@@ -3119,23 +2999,11 @@ ACE_OS::thr_setcancelstate (int new_state, int *old_state)
   ACE_OS_TRACE ("ACE_OS::thr_setcancelstate");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-  int old;
-  old = pthread_setcancel (new_state);
-  if (old == -1)
-    return -1;
-  *old_state = old;
-  return 0;
-#   elif defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_UNUSED_ARG (old_state);
-  ACE_OSCALL_RETURN (pthread_setintr (new_state), int, -1);
-#   else /* this is draft 7 or std */
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setcancelstate (new_state,
                                                                old_state),
                                        result),
                      int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
 # elif defined (ACE_HAS_STHREADS)
   ACE_UNUSED_ARG (new_state);
   ACE_UNUSED_ARG (old_state);
@@ -3162,23 +3030,11 @@ ACE_OS::thr_setcanceltype (int new_type, int *old_type)
   ACE_OS_TRACE ("ACE_OS::thr_setcanceltype");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-  int old;
-  old = pthread_setasynccancel (new_type);
-  if (old == -1)
-    return -1;
-  *old_type = old;
-  return 0;
-#   elif defined (ACE_HAS_PTHREADS_DRAFT6)
-  ACE_UNUSED_ARG (old_type);
-  ACE_OSCALL_RETURN (pthread_setintrtype (new_type), int, -1);
-#   else /* this is draft 7 or std */
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (pthread_setcanceltype (new_type,
                                                               old_type),
                                        result),
                      int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
 # else /* Could be ACE_HAS_PTHREADS && ACE_LACKS_PTHREAD_CANCEL */
   ACE_UNUSED_ARG (new_type);
   ACE_UNUSED_ARG (old_type);
@@ -3225,18 +3081,6 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy)
 # if (defined (ACE_HAS_PTHREADS) && \
       (!defined (ACE_LACKS_SETSCHED) || defined (ACE_HAS_PTHREAD_SCHEDPARAM)))
 
-#   if defined (ACE_HAS_PTHREADS_DRAFT4)
-  int result;
-  result = pthread_setprio (ht_id, priority);
-  return (result == -1 ? -1 : 0);
-#   elif defined (ACE_HAS_PTHREADS_DRAFT6)
-  pthread_attr_t  attr;
-  if (pthread_getschedattr (ht_id, &attr) == -1)
-    return -1;
-  if (pthread_attr_setprio (attr, priority) == -1)
-    return -1;
-  return pthread_setschedattr (ht_id, attr);
-#   else
   int result;
   struct sched_param param;
   ACE_OS::memset ((void *) &param, 0, sizeof param);
@@ -3260,7 +3104,6 @@ ACE_OS::thr_setprio (ACE_hthread_t ht_id, int priority, int policy)
                                                               &param),
                                        result),
                      int, -1);
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 */
 # elif defined (ACE_HAS_STHREADS)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_setprio (ht_id, priority),
@@ -3309,21 +3152,13 @@ ACE_OS::thr_sigsetmask (int how,
                                        result),
                      int, -1);
 # elif defined (ACE_HAS_PTHREADS)
-  // Draft 4 and 6 implementations will sometimes have a sigprocmask () that
-  // modifies the calling thread's mask only.  If this is not so for your
-  // platform, define ACE_LACKS_PTHREAD_THR_SIGSETMASK.
-#   if defined (ACE_HAS_PTHREADS_DRAFT4) || \
-    defined (ACE_HAS_PTHREADS_DRAFT6) || (defined (_UNICOS) && _UNICOS == 9)
-  //FUZZ: disable check_for_lack_ACE_OS
-  ACE_OSCALL_RETURN (::sigprocmask (how, nsm, osm), int, -1);
-  //FUZZ: enable check_for_lack_ACE_OS
-#   elif !defined (ACE_LACKS_PTHREAD_SIGMASK)
+#   if !defined (ACE_LACKS_PTHREAD_SIGMASK)
   int result;
   //FUZZ: disable check_for_lack_ACE_OS
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsm, osm),
                                        result), int, -1);
   //FUZZ: enable check_for_lack_ACE_OS
-#   endif /* ACE_HAS_PTHREADS_DRAFT4 || ACE_HAS_PTHREADS_DRAFT6 || _UNICOS 9 */
+#   endif /* !ACE_LACKS_PTHREAD_SIGMASK */
 
 #if 0
   /* Don't know if any platform actually needs this... */
@@ -3423,11 +3258,7 @@ ACE_OS::thr_testcancel (void)
   ACE_OS_TRACE ("ACE_OS::thr_testcancel");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_CANCEL)
-#if defined(ACE_HAS_PTHREADS_DRAFT6)
-  pthread_testintr ();
-#else /* ACE_HAS_PTHREADS_DRAFT6 */
   pthread_testcancel ();
-#endif /* !ACE_HAS_PTHREADS_DRAFT6 */
 # elif defined (ACE_HAS_STHREADS)
 # elif defined (ACE_HAS_WTHREADS)
 # elif defined (ACE_HAS_VXTHREADS)
@@ -3444,14 +3275,7 @@ ACE_OS::thr_yield (void)
   ACE_OS_TRACE ("ACE_OS::thr_yield");
 #if defined (ACE_HAS_THREADS)
 # if defined (ACE_HAS_PTHREADS)
-#   if defined (ACE_HAS_PTHREADS_STD)
-  // Note - this is a POSIX.4 function - not a POSIX.1c function...
   ::sched_yield ();
-#   elif defined (ACE_HAS_PTHREADS_DRAFT6)
-  pthread_yield (0);
-#   else    /* Draft 4 and 7 */
-  pthread_yield ();
-#   endif  /* ACE_HAS_PTHREADS_STD */
 # elif defined (ACE_HAS_STHREADS)
   ::thr_yield ();
 # elif defined (ACE_HAS_WTHREADS)
diff --git a/ACE/ace/OS_NS_pwd.inl b/ACE/ace/OS_NS_pwd.inl
index 0c05d61d23f..029dd034d51 100644
--- a/ACE/ace/OS_NS_pwd.inl
+++ b/ACE/ace/OS_NS_pwd.inl
@@ -55,7 +55,7 @@ ACE_OS::getpwnam_r (const char *name, struct passwd *pwent,
 #elif !defined (ACE_LACKS_PWD_FUNCTIONS)
 # if defined (ACE_HAS_REENTRANT_FUNCTIONS)
 #   if !defined (ACE_LACKS_PWD_REENTRANT_FUNCTIONS)
-#     if defined (ACE_HAS_PTHREADS_STD) && \
+#     if defined (ACE_HAS_PTHREADS) && \
       !defined (ACE_HAS_STHREADS) || \
       defined (HPUX_11)  || \
       defined (__USLC__) // Added by Roland Gigler for SCO UnixWare 7.
@@ -85,7 +85,7 @@ ACE_OS::getpwnam_r (const char *name, struct passwd *pwent,
     return pwent;
 #     else
   return ::getpwnam_r (name, pwent, buffer, buflen);
-#     endif /* ACE_HAS_PTHREADS_STD */
+#     endif /* ACE_HAS_PTHREADS */
 #   else
   ACE_UNUSED_ARG (name);
   ACE_UNUSED_ARG (pwent);
diff --git a/ACE/ace/OS_NS_signal.inl b/ACE/ace/OS_NS_signal.inl
index df71ce0eb23..98f02459494 100644
--- a/ACE/ace/OS_NS_signal.inl
+++ b/ACE/ace/OS_NS_signal.inl
@@ -26,18 +26,18 @@ kill (pid_t pid, int signum)
 ACE_INLINE int
 pthread_sigmask (int how, const sigset_t *nsp, sigset_t *osp)
 {
-#if defined (ACE_HAS_PTHREADS_STD) && !defined (ACE_LACKS_PTHREAD_SIGMASK)
+#if defined (ACE_HAS_PTHREADS) && !defined (ACE_LACKS_PTHREAD_SIGMASK)
   int result;
   ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_sigmask (how, nsp, osp),
                                        result),
                      int,
                      -1);
-#else /* !ACE_HAS_PTHREADS_STD && !ACE_LACKS_PTHREAD_SIGMASK */
+#else /* !ACE_HAS_PTHREADS && !ACE_LACKS_PTHREAD_SIGMASK */
   ACE_UNUSED_ARG (how);
   ACE_UNUSED_ARG (nsp);
   ACE_UNUSED_ARG (osp);
   ACE_NOTSUP_RETURN (-1);
-#endif /* ACE_HAS_PTHREADS_STD && !ACE_LACKS_PTHREAD_SIGMASK */
+#endif /* ACE_HAS_PTHREADS && !ACE_LACKS_PTHREAD_SIGMASK */
 }
 
 ACE_INLINE int
diff --git a/ACE/ace/OS_NS_string.cpp b/ACE/ace/OS_NS_string.cpp
index 9a7f44ab423..be63e28e450 100644
--- a/ACE/ace/OS_NS_string.cpp
+++ b/ACE/ace/OS_NS_string.cpp
@@ -119,7 +119,7 @@ ACE_OS::strerror (int errnum)
   // and set errno to EINVAL.
   ACE_Errno_Guard g (errno);
   errno = 0;
-  char *errmsg;
+  char *errmsg = 0;
 
 #if defined (ACE_HAS_TR24731_2005_CRT)
   errmsg = ret_errortext;
@@ -360,7 +360,7 @@ ACE_OS::strtok_r_emulation (ACE_WCHAR_T *s,
 {
   ACE_WCHAR_T* sbegin = s ? s : *lasts;
   sbegin += ACE_OS::strspn(sbegin, tokens);
-  if (*sbegin == 0) 
+  if (*sbegin == 0)
     {
       static ACE_WCHAR_T empty[1] = { 0 };
       *lasts = empty;
diff --git a/ACE/ace/Recursive_Thread_Mutex.cpp b/ACE/ace/Recursive_Thread_Mutex.cpp
index 673b77ca2ed..285789dd696 100644
--- a/ACE/ace/Recursive_Thread_Mutex.cpp
+++ b/ACE/ace/Recursive_Thread_Mutex.cpp
@@ -82,7 +82,7 @@ int
 ACE_Recursive_Thread_Mutex::get_nesting_level (void)
 {
   // ACE_TRACE ("ACE_Recursive_Thread_Mutex::get_nesting_level");
-#if defined (ACE_HAS_WINCE) || defined (ACE_VXWORKS)
+#if defined (ACE_HAS_WINCE) || defined (ACE_HAS_VXTHREADS)
   ACE_NOTSUP_RETURN (-1);
 #elif defined (ACE_HAS_RECURSIVE_MUTEXES)
 # if defined (ACE_WIN32)
diff --git a/ACE/ace/Select_Reactor_Base.cpp b/ACE/ace/Select_Reactor_Base.cpp
index ae6ae6e410c..fedbd3d276f 100644
--- a/ACE/ace/Select_Reactor_Base.cpp
+++ b/ACE/ace/Select_Reactor_Base.cpp
@@ -686,17 +686,17 @@ ACE_Select_Reactor_Notify::notify (ACE_Event_Handler *event_handler,
     notification_queue_.push_new_notification(buffer);
 
   if (notification_required == -1)
-  {
-    return -1;
-  }
+    {
+      return -1;
+    }
 
   if (notification_required == 0)
-  {
-    // No failures, the handler is now owned by the notification queue
-    safe_handler.release ();
+    {
+      // No failures, the handler is now owned by the notification queue
+      safe_handler.release ();
 
-    return 0;
-  }
+      return 0;
+    }
 #endif /* ACE_HAS_REACTOR_NOTIFICATION_QUEUE */
 
   ssize_t const n = ACE::send (this->notification_pipe_.write_handle (),
diff --git a/ACE/ace/Thread_Manager.cpp b/ACE/ace/Thread_Manager.cpp
index d164039ba1b..f9a6b934bde 100644
--- a/ACE/ace/Thread_Manager.cpp
+++ b/ACE/ace/Thread_Manager.cpp
@@ -1412,12 +1412,6 @@ ACE_Thread_Manager::join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status)
 # endif /* ! _AIX */
             return -1;
 
-# if defined (ACE_HAS_PTHREADS_DRAFT4)  &&  defined (ACE_LACKS_SETDETACH)
-          // Must explicitly detach threads.  Threads without THR_DETACHED
-          // were detached in ACE_OS::thr_create ().
-          ::pthread_detach (&tdb->thr_handle_);
-# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */
-
           delete tdb;
           return 0;
           // return immediately if we've found the thread we want to join.
@@ -1458,12 +1452,6 @@ ACE_Thread_Manager::join (ACE_thread_t tid, ACE_THR_FUNC_RETURN *status)
 # endif /* ! _AIX */
     return -1;
 
-# if defined (ACE_HAS_PTHREADS_DRAFT4)  &&  defined (ACE_LACKS_SETDETACH)
-  // Must explicitly detach threads.  Threads without THR_DETACHED
-  // were detached in ACE_OS::thr_create ().
-
-  ::pthread_detach (&tdb.thr_handle_);
-# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */
   return 0;
 }
 
@@ -1531,12 +1519,6 @@ ACE_Thread_Manager::wait_grp (int grp_id)
     {
       if (ACE_Thread::join (copy_table[i].thr_handle_) == -1)
         result = -1;
-
-# if defined (ACE_HAS_PTHREADS_DRAFT4)  &&  defined (ACE_LACKS_SETDETACH)
-      // Must explicitly detach threads.  Threads without THR_DETACHED
-      // were detached in ACE_OS::thr_create ().
-      ::pthread_detach (&copy_table[i].thr_handle_);
-# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */
     }
 
   delete [] copy_table;
@@ -1683,11 +1665,6 @@ ACE_Thread_Manager::wait (const ACE_Time_Value *timeout,
           // Detached handles shouldn't reached here.
           (void) ACE_Thread::join (item->thr_handle_);
 
-# if defined (ACE_HAS_PTHREADS_DRAFT4)  &&  defined (ACE_LACKS_SETDETACH)
-        // Must explicitly detach threads.  Threads without
-        // THR_DETACHED were detached in ACE_OS::thr_create ().
-        ::pthread_detach (&item->thr_handle_);
-# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */
         delete item;
       }
 
@@ -1800,12 +1777,6 @@ ACE_Thread_Manager::wait_task (ACE_Task_Base *task)
     {
       if (ACE_Thread::join (copy_table[i].thr_handle_) == -1)
         result = -1;
-
-# if defined (ACE_HAS_PTHREADS_DRAFT4)  &&  defined (ACE_LACKS_SETDETACH)
-      // Must explicitly detach threads.  Threads without THR_DETACHED
-      // were detached in ACE_OS::thr_create ().
-      ::pthread_detach (&copy_table[i].thr_handle_);
-# endif /* ACE_HAS_PTHREADS_DRAFT4 && ACE_LACKS_SETDETACH */
     }
 
   delete [] copy_table;
diff --git a/ACE/ace/Token.h b/ACE/ace/Token.h
index 9344809ca51..81b2d7173af 100644
--- a/ACE/ace/Token.h
+++ b/ACE/ace/Token.h
@@ -29,7 +29,7 @@
 
 #include "ace/Thread_Mutex.h"
 
-#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || defined (ACE_VXWORKS)
+#if (defined (ACE_WIN32) && !defined (ACE_HAS_WINCE)) || defined (ACE_HAS_VXTHREADS)
 // If platforms support semaphores with timed wait, then we use semaphores instead of c.v.
 # define ACE_TOKEN_USES_SEMAPHORE
 #endif /* (ACE_WIN32 && !ACE_HAS_WINCE) || VXWORKS */
diff --git a/ACE/ace/config-aix-5.x.h b/ACE/ace/config-aix-5.x.h
index 68ad85c233c..0b99611f820 100644
--- a/ACE/ace/config-aix-5.x.h
+++ b/ACE/ace/config-aix-5.x.h
@@ -289,7 +289,6 @@
 #  endif
 
 #  define ACE_HAS_PTHREADS
-#  define ACE_HAS_PTHREADS_STD
 #  define ACE_HAS_PTHREADS_UNIX98_EXT
 #  define ACE_HAS_PTHREAD_CONTINUE_NP
 #  define ACE_HAS_PTHREAD_SUSPEND_NP
diff --git a/ACE/ace/config-cray.h b/ACE/ace/config-cray.h
index d63cd3b48eb..c50cc9f903e 100644
--- a/ACE/ace/config-cray.h
+++ b/ACE/ace/config-cray.h
@@ -53,22 +53,6 @@
 
 #define ACE_HAS_PTHREADS
 
-// UNICOS 10 and UNICOS/mk implement a small subset of POSIX Threads,
-// but the prototypes follow the POSIX.1c-1995 definitions.  Earlier
-// UNICOS versions sport Draft 7 threads.
-
-#if _UNICOS > 9
-# define ACE_HAS_PTHREADS_STD
-#else
-# define ACE_HAS_PTHREADS_DRAFT7
-# define ACE_LACKS_PTHREAD_ATTR_SETSTACKSIZE
-# define ACE_LACKS_PTHREAD_ATTR_SETSTACKADDR
-  // UNICOS 9 doesn't have this, nor sched.h
-# define SCHED_OTHER 0
-# define SCHED_FIFO 1
-# define SCHED_RR 2
-#endif
-
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 
 #define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP
diff --git a/ACE/ace/config-cygwin32.h b/ACE/ace/config-cygwin32.h
index 04b9e079d51..99b709e4c49 100644
--- a/ACE/ace/config-cygwin32.h
+++ b/ACE/ace/config-cygwin32.h
@@ -181,8 +181,6 @@
 #   define ACE_HAS_PTHREAD_CONTINUE 1
 #   define ACE_HAS_PTHREAD_SUSPEND 1
 
-// ... and the final standard even!
-#  define ACE_HAS_PTHREADS_STD
 #  define ACE_LACKS_PTHREAD_ATTR_SETSTACKADDR
 // Cygwin (see pthread.h): Not supported or implemented.
 #  define ACE_LACKS_SETSCHED
diff --git a/ACE/ace/config-hpux-11.00.h b/ACE/ace/config-hpux-11.00.h
index ff1413f7007..ae83149b845 100644
--- a/ACE/ace/config-hpux-11.00.h
+++ b/ACE/ace/config-hpux-11.00.h
@@ -425,8 +425,6 @@
 // features (lacks thread priority inheritance and protection), so
 // config-posix.h doesn't get this one...
 #  define ACE_HAS_PTHREADS
-
-#  define ACE_HAS_PTHREADS_STD
 #  define ACE_HAS_PTHREADS_UNIX98_EXT
 #  define ACE_HAS_PTHREAD_CONTINUE
 #  define ACE_HAS_PTHREAD_RESUME_NP
diff --git a/ACE/ace/config-integritySCA.h b/ACE/ace/config-integritySCA.h
index 2a164db6ca3..5c0a356c46f 100644
--- a/ACE/ace/config-integritySCA.h
+++ b/ACE/ace/config-integritySCA.h
@@ -75,7 +75,6 @@
 #define ACE_HAS_THREADS
 
 #define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_STD
 /***** End Threading Defines *****/
 
 /***** Hardware Defines *****/
diff --git a/ACE/ace/config-irix6.x-common.h b/ACE/ace/config-irix6.x-common.h
index 38d8ea5f5cc..72629881ec7 100644
--- a/ACE/ace/config-irix6.x-common.h
+++ b/ACE/ace/config-irix6.x-common.h
@@ -240,7 +240,6 @@
 
 // IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c
 #define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_STD
 
 // Compiler/platform has thread-specific storage
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
diff --git a/ACE/ace/config-linux.h b/ACE/ace/config-linux.h
index 982d699fbd8..7f6510f7d05 100644
--- a/ACE/ace/config-linux.h
+++ b/ACE/ace/config-linux.h
@@ -26,8 +26,6 @@
 #define ACE_HAS_THREADS
 // And they're even POSIX pthreads (LinuxThreads implementation)
 #define ACE_HAS_PTHREADS
-// ... and the final standard even!
-#define ACE_HAS_PTHREADS_STD
 
 // On linux this is part of pthreads
 #  if (defined _POSIX_C_SOURCE && (_POSIX_C_SOURCE - 0) >= 199309L)
diff --git a/ACE/ace/config-macosx-leopard.h b/ACE/ace/config-macosx-leopard.h
index 417c0c5944b..f2f73a4683f 100644
--- a/ACE/ace/config-macosx-leopard.h
+++ b/ACE/ace/config-macosx-leopard.h
@@ -175,7 +175,6 @@
 # define ACE_HAS_THREADS
 // And they're even POSIX pthreads
 # define ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
 # define ACE_HAS_PTHREAD_SCHEDPARAM
 # define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #endif  /* ACE_MT_SAFE == 1 */
diff --git a/ACE/ace/config-macosx-panther.h b/ACE/ace/config-macosx-panther.h
index 65c0b6aba6f..1c7361fd416 100644
--- a/ACE/ace/config-macosx-panther.h
+++ b/ACE/ace/config-macosx-panther.h
@@ -143,7 +143,6 @@
 # define ACE_HAS_THREADS
 // And they're even POSIX pthreads
 # define ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
 # define ACE_HAS_PTHREAD_SCHEDPARAM
 # define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #endif  /* ACE_MT_SAFE == 1 */
diff --git a/ACE/ace/config-macosx-tiger.h b/ACE/ace/config-macosx-tiger.h
index 5655e9d0675..906509818ab 100644
--- a/ACE/ace/config-macosx-tiger.h
+++ b/ACE/ace/config-macosx-tiger.h
@@ -171,7 +171,6 @@
 # define ACE_HAS_THREADS
 // And they're even POSIX pthreads
 # define ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
 # define ACE_HAS_PTHREAD_SCHEDPARAM
 # define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #endif  /* ACE_MT_SAFE == 1 */
diff --git a/ACE/ace/config-macosx.h b/ACE/ace/config-macosx.h
index c772efb07c8..c721353ca48 100644
--- a/ACE/ace/config-macosx.h
+++ b/ACE/ace/config-macosx.h
@@ -145,7 +145,6 @@
 # define ACE_HAS_THREADS
 // And they're even POSIX pthreads
 # define ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
 # define ACE_HAS_THREAD_SPECIFIC_STORAGE
 # define ACE_LACKS_THREAD_PROCESS_SCOPING
 #endif  /* ACE_MT_SAFE == 1 */
diff --git a/ACE/ace/config-mvs.h b/ACE/ace/config-mvs.h
index 239452a93ec..3572bae3cde 100644
--- a/ACE/ace/config-mvs.h
+++ b/ACE/ace/config-mvs.h
@@ -56,7 +56,6 @@
 #define ACE_HAS_POSIX_NONBLOCK
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_DRAFT6
 #define ACE_HAS_PTHREAD_CONDATTR_SETKIND_NP
 #define ACE_HAS_PTHREAD_MUTEXATTR_SETKIND_NP
 #define ACE_HAS_SIGINFO_T
diff --git a/ACE/ace/config-netbsd.h b/ACE/ace/config-netbsd.h
index 4a091a380d1..7c25423fe4c 100644
--- a/ACE/ace/config-netbsd.h
+++ b/ACE/ace/config-netbsd.h
@@ -15,7 +15,6 @@
 #if defined(ACE_MT_SAFE) && (ACE_MT_SAFE != 0)
 #  define ACE_HAS_THREADS 1
 #  define ACE_HAS_PTHREADS 1
-#  define ACE_HAS_PTHREADS_STD 1
 #  define ACE_HAS_PTHREADS_UNIX98_EXT 1
 #  define ACE_HAS_PTHREAD_RESUME_NP 1
 #  define ACE_HAS_PTHREAD_SUSPEND_NP 1
diff --git a/ACE/ace/config-openvms.h b/ACE/ace/config-openvms.h
index 42442c9070e..998a1b90078 100644
--- a/ACE/ace/config-openvms.h
+++ b/ACE/ace/config-openvms.h
@@ -150,7 +150,6 @@
 #define ACE_LACKS_THREAD_PROCESS_SCOPING 1
 
 #define ACE_HAS_PTHREADS 1
-#define ACE_HAS_PTHREADS_STD 1
 #define ACE_HAS_PTHREAD_PROCESS_ENUM 1
 #define ACE_LACKS_UNNAMED_SEMAPHORE 1
 #define ACE_MT_SAFE 1
diff --git a/ACE/ace/config-posix.h b/ACE/ace/config-posix.h
index e571574a5c4..482e2b91d10 100644
--- a/ACE/ace/config-posix.h
+++ b/ACE/ace/config-posix.h
@@ -59,10 +59,6 @@
 #       define ACE_HAS_PTHREADS
 #     endif /* ACE_HAS_PTHREADS */
 
-#     if !defined(ACE_HAS_PTHREADS_STD)
-#       define ACE_HAS_PTHREADS_STD
-#     endif /* ACE_HAS_PTHREADS_STD */
-
 #   endif /* _POSIX_THREADS */
 # endif /* ACE_HAS_THREADS */
 #endif /* !ACE_MT_SAFE */
diff --git a/ACE/ace/config-qnx-neutrino.h b/ACE/ace/config-qnx-neutrino.h
index e60f6c87ba5..ba53271f0b5 100644
--- a/ACE/ace/config-qnx-neutrino.h
+++ b/ACE/ace/config-qnx-neutrino.h
@@ -68,7 +68,6 @@
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_STD
 #define ACE_HAS_P_READ_WRITE
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_SELECT_H
diff --git a/ACE/ace/config-qnx-rtp-62x.h b/ACE/ace/config-qnx-rtp-62x.h
index 114d53710f9..6ccea40af39 100644
--- a/ACE/ace/config-qnx-rtp-62x.h
+++ b/ACE/ace/config-qnx-rtp-62x.h
@@ -43,7 +43,6 @@
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_STD
 #define ACE_HAS_P_READ_WRITE
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_SELECT_H
diff --git a/ACE/ace/config-qnx-rtp-pre62x.h b/ACE/ace/config-qnx-rtp-pre62x.h
index 5f32f71c318..00ad0166f18 100644
--- a/ACE/ace/config-qnx-rtp-pre62x.h
+++ b/ACE/ace/config-qnx-rtp-pre62x.h
@@ -41,7 +41,6 @@
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_POSIX_TIME
 #define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_STD
 #define ACE_HAS_P_READ_WRITE
 #define ACE_HAS_REENTRANT_FUNCTIONS
 #define ACE_HAS_SELECT_H
diff --git a/ACE/ace/config-rtems.h b/ACE/ace/config-rtems.h
index f7a600dc5b1..b32fbb8c15a 100644
--- a/ACE/ace/config-rtems.h
+++ b/ACE/ace/config-rtems.h
@@ -71,7 +71,6 @@
 #if ACE_MT_SAFE
 # define ACE_HAS_THREADS
 # define ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
 # define ACE_HAS_THREAD_SPECIFIC_STORAGE
 # define ACE_HAS_PTHREAD_SCHEDPARAM
 # define ACE_LACKS_THREAD_PROCESS_SCOPING
diff --git a/ACE/ace/config-sunos5.5.h b/ACE/ace/config-sunos5.5.h
index 56fc7e9c0d8..3c7c8494ee0 100644
--- a/ACE/ace/config-sunos5.5.h
+++ b/ACE/ace/config-sunos5.5.h
@@ -322,7 +322,6 @@
 # endif /* ! _POSIX_PTHREAD_SEMANTICS */
 
 # define ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
   // . . . but only supports SCHED_OTHER scheduling policy
 # define ACE_HAS_ONLY_SCHED_OTHER
 # define ACE_HAS_SIGWAIT
diff --git a/ACE/ace/config-tandem-nsk-mips-v2.h b/ACE/ace/config-tandem-nsk-mips-v2.h
index b96d033f5d4..3dee75016c0 100644
--- a/ACE/ace/config-tandem-nsk-mips-v2.h
+++ b/ACE/ace/config-tandem-nsk-mips-v2.h
@@ -250,19 +250,6 @@ typedef enum CMA_T_SCHED_POLICY {
 // ACE_HAS_... thing for extensions.
 #define ACE_HAS_PTHREADS
 
-// Platform's 'Pthreads' is .4a draft 4
-#ifndef ACE_TANDEM_T1248_PTHREADS
-#  define ACE_HAS_PTHREADS_DRAFT4
-#  define ACE_LACKS_CONST_TIMESPEC_PTR
-extern int cma_sigwait  (sigset_t *);
-#endif
-
-// Platform supports POSIX.1c-1995 threads
-// (This is the final standard Pthreads).
-#ifdef ACE_TANDEM_T1248_PTHREADS
-#define ACE_HAS_PTHREADS_STD
-#endif
-
 // Standard pthreads supports only SCHED_FIFO
 #define ACE_HAS_ONLY_SCHED_FIFO
 
diff --git a/ACE/ace/config-tandem-nsk-mips-v3.h b/ACE/ace/config-tandem-nsk-mips-v3.h
index a4bedc89750..80fdb49becd 100644
--- a/ACE/ace/config-tandem-nsk-mips-v3.h
+++ b/ACE/ace/config-tandem-nsk-mips-v3.h
@@ -275,19 +275,6 @@ typedef enum CMA_T_SCHED_POLICY {
 // ACE_HAS_... thing for extensions.
 #define ACE_HAS_PTHREADS
 
-// Platform's 'Pthreads' is .4a draft 4
-#ifndef ACE_TANDEM_T1248_PTHREADS
-#  define ACE_HAS_PTHREADS_DRAFT4
-#  define ACE_LACKS_CONST_TIMESPEC_PTR
-extern int cma_sigwait  (sigset_t *);
-#endif
-
-// Platform supports POSIX.1c-1995 threads
-// (This is the final standard Pthreads).
-#ifdef ACE_TANDEM_T1248_PTHREADS
-#define ACE_HAS_PTHREADS_STD
-#endif
-
 // Standard pthreads supports only SCHED_FIFO
 #define ACE_HAS_ONLY_SCHED_FIFO
 
diff --git a/ACE/ace/config-tru64.h b/ACE/ace/config-tru64.h
index 02532cecab9..1877af703bb 100644
--- a/ACE/ace/config-tru64.h
+++ b/ACE/ace/config-tru64.h
@@ -59,47 +59,17 @@
 #  endif  /* __cplusplus */
 #endif /* ! __GNUG__ && ! __DECCXX && ! __rational__ */
 
-#if defined(_POSIX_C_SOURCE) && (_POSIX_C_SOURCE >= 199506L)
-  // cxx with POSIX 1003.1c-1995 threads (pthreads) . . .
-# define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
-# define ACE_HAS_BROKEN_IF_HEADER
-# define ACE_HAS_BROKEN_R_ROUTINES
+#define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
+#define ACE_HAS_BROKEN_IF_HEADER
+#define ACE_HAS_BROKEN_R_ROUTINES
 #if (ACE_MT_SAFE != 0)
 # define ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
 # define ACE_HAS_RECURSIVE_THR_EXIT_SEMANTICS
 #endif /* ACE_MT_SAFE != 0 */
-# define ACE_LACKS_T_ERRNO
-# if !defined (DIGITAL_UNIX)
-#   define DIGITAL_UNIX 0x400
-# endif /* ! DIGITAL_UNIX */
-  // DJT removed this due to some minor issues related to the
-  // definitions of timestruc_t and tid_t in procfs.h not sure what
-  // functionality is lost?  Platform supports <sys/procfs.h>
-  //#define ACE_HAS_PROC_FS
-#else /* _POSIX_C_SOURCE < 199506L */
-  // cxx with DCE threads . . .
-  // This ACE configuration is only supported with cxx; it has not been
-  // test with g++.
-# define ACE_HAS_BROKEN_MSG_H
-# define ACE_HAS_BROKEN_POSIX_TIME
-#if (ACE_MT_SAFE != 0)
-# define ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_DRAFT4
-# define ACE_HAS_THREAD_SELF
-# define ACE_LACKS_THREAD_PROCESS_SCOPING
-# define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-# define ACE_LACKS_PTHREAD_THR_SIGSETMASK
-#endif
-# define ACE_HAS_GETPAGESIZE
-# define ACE_HAS_PROC_FS
-# define ACE_HAS_SETKIND_NP
-# define ACE_LACKS_CONST_TIMESPEC_PTR
-# define ACE_LACKS_READDIR_R
-# define ACE_LACKS_SETSCHED
-# define ACE_LACKS_SIGNED_CHAR
-# define ACE_LACKS_SYSV_MSQ_PROTOS
-#endif /* _POSIX_C_SOURCE < 199506L */
+#define ACE_LACKS_T_ERRNO
+#if !defined (DIGITAL_UNIX)
+#  define DIGITAL_UNIX 0x400
+#endif /* ! DIGITAL_UNIX */
 
 #define ACE_SIZEOF_LONG 8
 
diff --git a/ACE/ace/config-unixware-7.1.0.h b/ACE/ace/config-unixware-7.1.0.h
index 808a247bb7f..53f42f3a1b1 100644
--- a/ACE/ace/config-unixware-7.1.0.h
+++ b/ACE/ace/config-unixware-7.1.0.h
@@ -164,9 +164,6 @@
 /* Platform supports POSIX Threads */
 #define ACE_HAS_PTHREADS 1
 
-/* Platform supports POSIX.1c-1995 threads */
-#define ACE_HAS_PTHREADS_STD 1
-
 /* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and
    PTHREAD_PROCESS_SHARED values */
 #define ACE_HAS_PTHREAD_PROCESS_ENUM 1
diff --git a/ACE/ace/config-unixware-7.1.0.udk.h b/ACE/ace/config-unixware-7.1.0.udk.h
index d608bbee680..0ba282a4e51 100644
--- a/ACE/ace/config-unixware-7.1.0.udk.h
+++ b/ACE/ace/config-unixware-7.1.0.udk.h
@@ -198,9 +198,6 @@
 /* Platform supports POSIX Threads */
 #define ACE_HAS_PTHREADS
 
-/* Platform supports POSIX.1c-1995 threads */
-#define ACE_HAS_PTHREADS_STD
-
 /* pthread.h declares an enum with PTHREAD_PROCESS_PRIVATE and
    PTHREAD_PROCESS_SHARED values */
 #define ACE_HAS_PTHREAD_PROCESS_ENUM
diff --git a/ACE/ace/config-vxworks5.x.h b/ACE/ace/config-vxworks5.x.h
index 767ef43370a..1883927007d 100644
--- a/ACE/ace/config-vxworks5.x.h
+++ b/ACE/ace/config-vxworks5.x.h
@@ -272,7 +272,6 @@
 // It is possible to enable pthread support with VxWorks, when the user decides
 // to use this, we need some more defines
 #if defined ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
 # define ACE_LACKS_CONDATTR_PSHARED
 # define ACE_LACKS_MUTEXATTR_PSHARED
 # define ACE_HAS_THREAD_SPECIFIC_STORAGE
diff --git a/ACE/ace/config-vxworks6.2.h b/ACE/ace/config-vxworks6.2.h
index c0861910d24..ff78628b15b 100644
--- a/ACE/ace/config-vxworks6.2.h
+++ b/ACE/ace/config-vxworks6.2.h
@@ -269,7 +269,6 @@
 // It is possible to enable pthread support with VxWorks, when the user decides
 // to use this, we need some more defines
 #if defined ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
 # define ACE_HAS_THREAD_SPECIFIC_STORAGE
 # define ACE_HAS_POSIX_SEM
 # define ACE_LACKS_MUTEXATTR_PSHARED
diff --git a/ACE/ace/config-vxworks6.3.h b/ACE/ace/config-vxworks6.3.h
index 5ae5d655c03..b855b301793 100644
--- a/ACE/ace/config-vxworks6.3.h
+++ b/ACE/ace/config-vxworks6.3.h
@@ -255,7 +255,6 @@
 // It is possible to enable pthread support with VxWorks, when the user decides
 // to use this, we need some more defines
 #if defined ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
 # define ACE_HAS_THREAD_SPECIFIC_STORAGE
 # define ACE_HAS_POSIX_SEM
 # define ACE_LACKS_MUTEXATTR_PSHARED
diff --git a/ACE/ace/config-vxworks6.4.h b/ACE/ace/config-vxworks6.4.h
index fe13eccbbe9..37b13ef7dd1 100644
--- a/ACE/ace/config-vxworks6.4.h
+++ b/ACE/ace/config-vxworks6.4.h
@@ -282,7 +282,6 @@
 // It is possible to enable pthread support with VxWorks, when the user decides
 // to use this, we need some more defines
 #if defined ACE_HAS_PTHREADS
-# define ACE_HAS_PTHREADS_STD
 # define ACE_HAS_THREAD_SPECIFIC_STORAGE
 # if !defined __RTP__
 #  define ACE_LACKS_PTHREAD_ATTR_SETSTACK
diff --git a/ACE/ace/config-win32-interix.h b/ACE/ace/config-win32-interix.h
index b9c064c4359..19cb586aa8f 100644
--- a/ACE/ace/config-win32-interix.h
+++ b/ACE/ace/config-win32-interix.h
@@ -37,7 +37,6 @@
 #define _THREAD_SAFE
 #define ACE_MTSAFE 1
 #define ACE_MT_SAFE 1
-#define ACE_HAS_PTHREADS_STD
 #define ACE_LACKS_PTHREAD_YIELD
 #define ACE_HAS_MUTEX_TIMEOUTS
 #else
diff --git a/ACE/ace/os_include/os_limits.h b/ACE/ace/os_include/os_limits.h
index e9ec48211a6..a7f6e9e0fb2 100644
--- a/ACE/ace/os_include/os_limits.h
+++ b/ACE/ace/os_include/os_limits.h
@@ -102,7 +102,7 @@ extern "C"
 #  define ACE_IOV_MAX IOV_MAX
 #endif /* ACE_IOV_MAX */
 
-#if defined (ACE_VXWORKS) && ((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x650)) && !defined (__RTP__)
+#if defined (ACE_VXWORKS) && ((ACE_VXWORKS >= 0x620) && (ACE_VXWORKS <= 0x660)) && !defined (__RTP__)
 #  if defined (PIPE_BUF) && (PIPE_BUF == -1)
 #    undef PIPE_BUF
 #  endif
diff --git a/ACE/ace/os_include/os_pthread.h b/ACE/ace/os_include/os_pthread.h
index 8708f4683e6..a80ad04fb8b 100644
--- a/ACE/ace/os_include/os_pthread.h
+++ b/ACE/ace/os_include/os_pthread.h
@@ -72,19 +72,6 @@ extern "C" pthread_t pthread_self (void);
 #  define ACE_SCHED_FIFO SCHED_FIFO
 #  define ACE_SCHED_RR SCHED_RR
 
-// Definitions for mapping POSIX pthreads draft 6 into 1003.1c names
-
-#  if defined (ACE_HAS_PTHREADS_DRAFT6)
-#    define PTHREAD_SCOPE_PROCESS           PTHREAD_SCOPE_LOCAL
-#    define PTHREAD_SCOPE_SYSTEM            PTHREAD_SCOPE_GLOBAL
-#    define PTHREAD_CREATE_UNDETACHED       0
-#    define PTHREAD_CREATE_DETACHED         1
-#    define PTHREAD_CREATE_JOINABLE         0
-#    define PTHREAD_EXPLICIT_SCHED          0
-#    define PTHREAD_MIN_PRIORITY            0
-#    define PTHREAD_MAX_PRIORITY            126
-#  endif /* ACE_HAS_PTHREADS_DRAFT6 */
-
 // Definitions for THREAD- and PROCESS-LEVEL priorities...some
 // implementations define these while others don't.  In order to
 // further complicate matters, we don't redefine the default (*_DEF)
@@ -301,35 +288,6 @@ extern "C" pthread_t pthread_self (void);
 #    endif /* PTHREAD_MUTEXTYPE_FAST */
 #  endif /* PTHREAD_PROCESS_SHARED */
 
-#  if defined (ACE_HAS_PTHREADS_DRAFT4)
-#    if defined (PTHREAD_PROCESS_PRIVATE)
-#      if !defined (USYNC_THREAD)
-#        define USYNC_THREAD    PTHREAD_PROCESS_PRIVATE
-#      endif /* ! USYNC_THREAD */
-#    else
-#      if !defined (USYNC_THREAD)
-#        define USYNC_THREAD    MUTEX_NONRECURSIVE_NP
-#      endif /* ! USYNC_THREAD */
-#    endif /* PTHREAD_PROCESS_PRIVATE */
-
-#    if defined (PTHREAD_PROCESS_SHARED)
-#      if !defined (USYNC_PROCESS)
-#        define USYNC_PROCESS   PTHREAD_PROCESS_SHARED
-#      endif /* ! USYNC_PROCESS */
-#    else
-#      if !defined (USYNC_PROCESS)
-#        define USYNC_PROCESS   MUTEX_NONRECURSIVE_NP
-#      endif /* ! USYNC_PROCESS */
-#    endif /* PTHREAD_PROCESS_SHARED */
-#  elif !defined (ACE_HAS_STHREADS)
-#    if !defined (USYNC_THREAD)
-#      define USYNC_THREAD PTHREAD_PROCESS_PRIVATE
-#    endif /* ! USYNC_THREAD */
-#      if !defined (USYNC_PROCESS)
-#        define USYNC_PROCESS PTHREAD_PROCESS_SHARED
-#      endif /* ! USYNC_PROCESS */
-#  endif /* ACE_HAS_PTHREADS_DRAFT4 */
-
    /* MM-Graz:  prevent warnings */
 #  if !defined (UNIXWARE_7_1)
 #    undef THR_BOUND
diff --git a/ACE/ace/os_include/os_time.h b/ACE/ace/os_include/os_time.h
index 6f19ad1282b..6d03b2f6e82 100644
--- a/ACE/ace/os_include/os_time.h
+++ b/ACE/ace/os_include/os_time.h
@@ -90,13 +90,13 @@ extern "C"
 // requirements as threads evolved.  They are probably not all needed - some
 // overlap or are otherwise confused.  This is an attempt to start
 // straightening them out.
-#if defined (ACE_HAS_PTHREADS_STD)    /* POSIX.1c threads (pthreads) */
+#if defined (ACE_HAS_PTHREADS)    /* POSIX.1c threads (pthreads) */
    // ... and 2-parameter asctime_r and ctime_r
 #  if !defined (ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R) && \
       !defined (ACE_HAS_STHREADS) && !defined (ACE_VXWORKS)
 #    define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 #  endif
-#endif /* ACE_HAS_PTHREADS_STD */
+#endif /* ACE_HAS_PTHREADS */
 
 #if defined (ACE_LACKS_STRPTIME_PROTOTYPE) && !defined (_XOPEN_SOURCE)
    extern char *strptime (const char *s, const char *fmt, struct tm *tp);
diff --git a/ACE/ace/os_include/sys/os_msg.h b/ACE/ace/os_include/sys/os_msg.h
index e6b2c6c1c63..fee07f3677b 100644
--- a/ACE/ace/os_include/sys/os_msg.h
+++ b/ACE/ace/os_include/sys/os_msg.h
@@ -27,14 +27,7 @@
 #include "ace/os_include/sys/os_ipc.h"
 
 #if !defined (ACE_LACKS_SYS_MSG_H)
-// OSF1 has problems with sys/msg.h and C++...
-#  if defined (ACE_HAS_BROKEN_MSG_H)
-#    define _KERNEL
-#  endif /* ACE_HAS_BROKEN_MSG_H */
-#  include /**/ <sys/msg.h>
-#  if defined (ACE_HAS_BROKEN_MSG_H)
-#    undef _KERNEL
-#  endif /* ACE_HAS_BROKEN_MSG_H */
+# include /**/ <sys/msg.h>
 #endif /* !ACE_LACKS_SYS_MSG_H */
 
 // Place all additions (especially function declarations) within extern "C" {}