diff options
Diffstat (limited to 'ace/os_include/os_pthread.h')
| -rw-r--r-- | ace/os_include/os_pthread.h | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/ace/os_include/os_pthread.h b/ace/os_include/os_pthread.h index 5c579a99056..6eccef3a418 100644 --- a/ace/os_include/os_pthread.h +++ b/ace/os_include/os_pthread.h @@ -66,6 +66,11 @@ extern "C" pthread_t pthread_self (void); } #endif /* !ACE_LACKS_PTHREAD_H */ +#if defined (ACE_HAS_PTHREAD_NP_H) +// FreeBSD declares _np (non-portable) pthread extensions in <pthread_np.h> +# include /**/ <pthread_np.h> +#endif + // @todo: need to reoganize to put includes at the top and the rest of the // code at the bottom. Also, move the classes out of this file. #if defined (ACE_HAS_PTHREADS) @@ -93,8 +98,8 @@ extern "C" pthread_t pthread_self (void); // programs to have their own ACE-wide "default". // PROCESS-level values -# if defined (_POSIX_PRIORITY_SCHEDULING) && \ - !defined(_UNICOS) && !defined(UNIXWARE_7_1) +# if (defined (_POSIX_PRIORITY_SCHEDULING) || defined (ACE_TANDEM_T1248_PTHREADS)) \ + && !defined(_UNICOS) && !defined(UNIXWARE_7_1) # define ACE_PROC_PRI_FIFO_MIN (sched_get_priority_min(SCHED_FIFO)) # define ACE_PROC_PRI_RR_MIN (sched_get_priority_min(SCHED_RR)) # if defined (HPUX) @@ -236,11 +241,13 @@ extern "C" pthread_t pthread_self (void); typedef pthread_t ACE_hthread_t; typedef pthread_t ACE_thread_t; + // native TSS key type + typedef pthread_key_t ACE_OS_thread_key_t; + // TSS key type to be used by application # if defined (ACE_HAS_TSS_EMULATION) - typedef pthread_key_t ACE_OS_thread_key_t; - typedef u_long ACE_thread_key_t; + typedef u_int ACE_thread_key_t; # else /* ! ACE_HAS_TSS_EMULATION */ - typedef pthread_key_t ACE_thread_key_t; + typedef ACE_OS_thread_key_t ACE_thread_key_t; # endif /* ! ACE_HAS_TSS_EMULATION */ # if !defined (ACE_LACKS_COND_T) |