diff options
| author | Steve Huston <shuston@riverace.com> | 2003-02-07 22:30:15 +0000 |
|---|---|---|
| committer | Steve Huston <shuston@riverace.com> | 2003-02-07 22:30:15 +0000 |
| commit | 82a6a56d63e3d4d0df725304430757f178d1d1c1 (patch) | |
| tree | 84401bce1b719306935904268d2ebf12db780ad0 | |
| parent | e6e20a375f29e47fce12c5ec0a380172613958d7 (diff) | |
| download | ATCD-82a6a56d63e3d4d0df725304430757f178d1d1c1.tar.gz | |
ChangeLogTag:Fri Feb 7 17:22:39 2003 Steve Huston <shuston@riverace.com>
| -rw-r--r-- | ChangeLog | 11 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 11 | ||||
| -rw-r--r-- | ace/OS.cpp | 8 |
3 files changed, 26 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog index 6bc99fdad2d..2da555d2311 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +Fri Feb 7 17:22:39 2003 Steve Huston <shuston@riverace.com> + + * ace/OS.cpp (ACE_OS::thr_create): Moved the pthread_setstack() call + (and the check for whether it's available) from inside the + Pthreads draft 4/6 section to the Pthreads standard section + and corrected the condition it's used (defined + ACE_HAS_PTHREAD_SETSTACK, not !defined ACE_HAS_PTHREAD_SETSTACK). + + Also see: + Thu Jan 16 19:06:19 2003 Stephen Torri <storri@cse.wustl.edu> + Fri Feb 7 16:55:58 2003 Heather Drury <drury_h@ociweb.com> * ace/config-aix-4.x.h: Reverted change to aix config file: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 6bc99fdad2d..2da555d2311 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,14 @@ +Fri Feb 7 17:22:39 2003 Steve Huston <shuston@riverace.com> + + * ace/OS.cpp (ACE_OS::thr_create): Moved the pthread_setstack() call + (and the check for whether it's available) from inside the + Pthreads draft 4/6 section to the Pthreads standard section + and corrected the condition it's used (defined + ACE_HAS_PTHREAD_SETSTACK, not !defined ACE_HAS_PTHREAD_SETSTACK). + + Also see: + Thu Jan 16 19:06:19 2003 Stephen Torri <storri@cse.wustl.edu> + Fri Feb 7 16:55:58 2003 Heather Drury <drury_h@ociweb.com> * ace/config-aix-4.x.h: Reverted change to aix config file: diff --git a/ace/OS.cpp b/ace/OS.cpp index bd51e9eb87f..7b6b060ea1f 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -2596,13 +2596,13 @@ ACE_OS::thr_create (ACE_THR_FUNC func, # if !defined (ACE_LACKS_THREAD_STACK_SIZE) // JCEJ 12/17/96 # if defined (ACE_HAS_PTHREADS_DRAFT4) || defined (ACE_HAS_PTHREADS_DRAFT6) -# if !defined (ACE_HAS_PTHREAD_SETSTACK) - if (::pthread_attr_setstack (&attr, stack, size) != 0) -# else if (::pthread_attr_setstacksize (&attr, size) != 0) -# endif /* ACE_HAS_PTHREAD_SETSTACK */ # else +# if defined (ACE_HAS_PTHREAD_SETSTACK) + if (ACE_ADAPT_RETVAL(pthread_attr_setstack (&attr, stack, size), result) == -1) +# else if (ACE_ADAPT_RETVAL(pthread_attr_setstacksize (&attr, size), result) == -1) +# endif /* ACE_HAS_PTHREAD_SETSTACK */ # endif /* ACE_HAS_PTHREADS_DRAFT4, 6 */ { # if defined (ACE_HAS_PTHREADS_DRAFT4) |