diff options
| author | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-04-14 12:51:07 +0000 |
|---|---|---|
| committer | schmidt <douglascraigschmidt@users.noreply.github.com> | 2001-04-14 12:51:07 +0000 |
| commit | 4d57d8ec21f9af467a7867166cb1046c943bec06 (patch) | |
| tree | 364cf0192d41806f2853725a1d663bb0cafbbe52 /ace | |
| parent | b2bd2137002718220073607c064ef82df6ac67a4 (diff) | |
| download | ATCD-4d57d8ec21f9af467a7867166cb1046c943bec06.tar.gz | |
ChangeLogTag:Fri Apr 13 11:58:58 2001 Carlos O'Ryan <coryan@uci.edu>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/Malloc_T.h | 1 | ||||
| -rw-r--r-- | ace/OS.i | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/ace/Malloc_T.h b/ace/Malloc_T.h index aff5f897f8d..f1d398e7b2c 100644 --- a/ace/Malloc_T.h +++ b/ace/Malloc_T.h @@ -10,7 +10,6 @@ */ //============================================================================= - #ifndef ACE_MALLOC_T_H #define ACE_MALLOC_T_H #include "ace/pre.h" @@ -8418,9 +8418,7 @@ ACE_OS::thr_yield (void) #if defined (ACE_HAS_PACE) && !defined (ACE_WIN32) ::pace_sched_yield (); #elif defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) - ::thr_yield (); -# elif defined (ACE_HAS_PTHREADS) +# 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 (); @@ -8429,6 +8427,8 @@ ACE_OS::thr_yield (void) # else /* Draft 4 and 7 */ ::pthread_yield (); # endif /* ACE_HAS_PTHREADS_STD */ +# elif defined (ACE_HAS_STHREADS) + ::thr_yield (); # elif defined (ACE_HAS_WTHREADS) ::Sleep (0); # elif defined (VXWORKS) |