Changed to ACE_HAS_PTHREADS_STD

11 files changed, 19 insertions, 13 deletions

diff --git a/ace/config-chorus.h b/ace/config-chorus.h
index 4dede48f27d..ae4d3d88ef8 100644
--- a/ace/config-chorus.h
+++ b/ace/config-chorus.h
@@ -75,7 +75,8 @@
 // Platforms lacks UNIX domain sockets.
 #define ACE_LACKS_UNIX_DOMAIN_SOCKETS
 #define ACE_LACKS_UTSNAME_T
-#define ACE_HAS_PTHREADS_1003_DOT_1C
+#define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_STD
 //#define ACE_LACKS_SETSCHED
 
 #define ACE_LACKS_MSYNC
diff --git a/ace/config-dgux-4.x-ghs.h b/ace/config-dgux-4.x-ghs.h
index b297d4f37be..0d20255b371 100644
--- a/ace/config-dgux-4.x-ghs.h
+++ b/ace/config-dgux-4.x-ghs.h
@@ -137,13 +137,13 @@
 // Platform supports threads.
 #define ACE_HAS_THREADS
 #define ACE_HAS_PTHREADS
-// DG/UX claims to implement draft 10 of the pthreads standard.  They also
-// claim that draft 10 is the final standard.  To get the behavior, some
+// DG/UX claims to implement draft 10 of the pthreads standard (which became
+// (with editorial change only) the final standard.  To get the behavior, some
 // further macros need to be defined which are specific to DG/UX.
 // _POSIX4A_DRAFT10_SOURCE turns on the draft 10 variant of threads.
 // _POSIX4A_DRAFT_SOURCE turns on sched_yield().
 #define _POSIX4A_DRAFT10_SOURCE
-#define ACE_HAS_PTHREADS_1003_DOT_1C
+#define ACE_HAS_PTHREADS_STD
 #define _POSIX4_DRAFT_SOURCE
 // Well, here are some from the standard they don't have...
 #define ACE_LACKS_KEYDELETE
diff --git a/ace/config-hpux11.h b/ace/config-hpux11.h
index 44cc0ef8b83..e95f26d481d 100644
--- a/ace/config-hpux11.h
+++ b/ace/config-hpux11.h
@@ -200,7 +200,7 @@
 
 #define ACE_HAS_THREADS
 #define ACE_HAS_PTHREADS
-#define ACE_HAS_PTHREADS_1003_DOT_1C
+#define ACE_HAS_PTHREADS_STD
 #define ACE_HAS_POSIX_SEM
 #define ACE_HAS_PTHREAD_T
 #define ACE_HAS_PTHREAD_EQUAL
diff --git a/ace/config-irix6.x-g++.h b/ace/config-irix6.x-g++.h
index a6e52b96a6e..ee7c8647709 100644
--- a/ace/config-irix6.x-g++.h
+++ b/ace/config-irix6.x-g++.h
@@ -30,6 +30,10 @@
 # define ACE_MT_SAFE 1
 #endif /* !ACE_MT_SAFE */
 #define ACE_HAS_IRIX62_THREADS
+
+// IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c
+#define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_STD
 #define ACE_HAS_PTHREAD_SIGMASK
 
 // Needed for the threading stuff?
@@ -43,9 +47,6 @@
 #define ACE_LACKS_CONDATTR_PSHARED
 #define ACE_LACKS_MUTEXATTR_PSHARED
 
-// IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c
-#define ACE_HAS_PTHREADS
-
 // Platforms has pthread_thr_sigsetmask
 #define ACE_HAS_PTHREAD_SIGMASK
 
diff --git a/ace/config-irix6.x-sgic++.h b/ace/config-irix6.x-sgic++.h
index eedee54c08b..ee0c357979b 100644
--- a/ace/config-irix6.x-sgic++.h
+++ b/ace/config-irix6.x-sgic++.h
@@ -31,6 +31,7 @@
 
 // IRIX 6.2 supports a variant of POSIX Pthreads, supposedly POSIX 1c
 #define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_STD
 
 // Platforms has pthread_thr_sigsetmask
 #define ACE_HAS_PTHREAD_SIGMASK
diff --git a/ace/config-linux-lxpthreads.h b/ace/config-linux-lxpthreads.h
index d8ddf469635..207056b6320 100644
--- a/ace/config-linux-lxpthreads.h
+++ b/ace/config-linux-lxpthreads.h
@@ -37,6 +37,8 @@
 #define ACE_HAS_THREADS
 // And they're even POSIX pthreads (MIT implementation)
 #define ACE_HAS_PTHREADS
+// ... and the final standard even!
+#define	ACE_HAS_PTHREADS_STD
 
 #define ACE_HAS_PTHREAD_SIGMASK			// JCEJ 12/19/96
 
@@ -50,7 +52,6 @@
 #else
 #  define PTHREAD_MAX_PRIORITY          32      // JCEJ 12/22/96	#3
 #endif
-#define	ACE_HAS_PTHREADS_1003_DOT_1C		// JCEJ 12/22/96	#4
 
 #define ACE_LACKS_THREAD_STACK_ADDR		// JCEJ 12/17/96
 #define ACE_LACKS_THREAD_STACK_SIZE		// JCEJ 12/17/96
diff --git a/ace/config-linux-pthread.h b/ace/config-linux-pthread.h
index bc9f765f749..4c592b26ba2 100644
--- a/ace/config-linux-pthread.h
+++ b/ace/config-linux-pthread.h
@@ -16,6 +16,7 @@
 #endif
 // And they're even POSIX pthreads (MIT implementation)
 #define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_STD
 #define ACE_LACKS_RWLOCK_T
 #define ACE_HAS_SIGWAIT
 // If ACE doesn't compile due to the lack of these methods, please
diff --git a/ace/config-mit-pthread.h b/ace/config-mit-pthread.h
index fca68d1571a..99c43abb760 100644
--- a/ace/config-mit-pthread.h
+++ b/ace/config-mit-pthread.h
@@ -15,6 +15,7 @@
 #endif
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define	ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_STD
 #define	ACE_HAS_PTHREAD_T
 #define	ACE_LACKS_PTHREAD_CANCEL
 #define ACE_HAS_PTHREAD_SIGMASK
diff --git a/ace/config-sco-5.0.0-mit-pthread.h b/ace/config-sco-5.0.0-mit-pthread.h
index cd80d9a7da3..1e1768b75d4 100644
--- a/ace/config-sco-5.0.0-mit-pthread.h
+++ b/ace/config-sco-5.0.0-mit-pthread.h
@@ -141,6 +141,7 @@
 #endif
 #define ACE_HAS_THREAD_SPECIFIC_STORAGE
 #define ACE_HAS_PTHREADS
+#define ACE_HAS_PTHREADS_STD
 #define ACE_HAS_PTHREAD_T
 #define ACE_LACKS_PTHREAD_CANCEL
 #define ACE_HAS_PTHREAD_SIGMASK
diff --git a/ace/config-sunos5.5.h b/ace/config-sunos5.5.h
index b335332988e..cf4c95f6784 100644
--- a/ace/config-sunos5.5.h
+++ b/ace/config-sunos5.5.h
@@ -196,13 +196,12 @@
   // Platform supports POSIX pthreads *and* Solaris threads!  If you
   // only want to use POSIX pthreads just comment out ACE_HAS_STHREADS.
   // Or, add -D_POSIX_PTHREAD_SEMANTICS to your CFLAGS.
-# if defined (_POSIX_PTHREAD_SEMANTICS)
-#   define ACE_HAS_PTHREADS_1003_DOT_1C
-# else  /* ! _POSIX_PTHREAD_SEMANTICS */
+# if !defined (_POSIX_PTHREAD_SEMANTICS)
 #   define ACE_HAS_STHREADS
 # 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/config-sunos5.6.h b/ace/config-sunos5.6.h
index 0f260e66578..54dc38d5cc7 100644
--- a/ace/config-sunos5.6.h
+++ b/ace/config-sunos5.6.h
@@ -15,7 +15,7 @@
 #if (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 199506L) || \
     defined (__EXTENSIONS__)
 # undef  ACE_HAS_ONEARG_SIGWAIT
-# define ACE_HAS_PTHREADS_1003_DOT_1C
+# define ACE_HAS_PTHREADS_STD
 # define ACE_HAS_2_PARAM_ASCTIME_R_AND_CTIME_R
 // Hack 'cuz -DPOSIX_SOURCE=199506L and -DEXTENSIONS hides this.
 # include <sys/types.h>