diff options
| author | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-16 02:44:44 +0000 |
|---|---|---|
| committer | levine <levine@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-03-16 02:44:44 +0000 |
| commit | 79aec00a4480283bdd22619bb9eb934114a4e813 (patch) | |
| tree | ab992959c2d7ebd947735dc547c23122ce6ced77 /ace | |
| parent | 6005b0d8bef5ddaf0b5b2b75e6346ebb9c39ad49 (diff) | |
| download | ATCD-79aec00a4480283bdd22619bb9eb934114a4e813.tar.gz | |
ChangeLogTag: Wed Mar 15 20:43:14 2000 David L. Levine <levine@cs.wustl.edu>
Diffstat (limited to 'ace')
| -rw-r--r-- | ace/OS.cpp | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/ace/OS.cpp b/ace/OS.cpp index da6e31f269d..3aa0a55ac8c 100644 --- a/ace/OS.cpp +++ b/ace/OS.cpp @@ -3865,17 +3865,19 @@ ACE_OS::thr_keycreate (ACE_OS_thread_key_t *key, ACE_UNUSED_ARG (inst); -# if defined (ACE_HAS_STDARG_THR_DEST) +# if defined (ACE_HAS_PTHREADS_DRAFT4) +# if defined (ACE_HAS_STDARG_THR_DEST) ACE_OSCALL_RETURN (::pthread_keycreate (key, (void (*)(...)) dest), int, -1); -# elif defined (ACE_HAS_PTHREADS_DRAFT4) +# 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 ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_key_create (key, dest), ace_result_), int, -1); -# endif /* ACE_HAS_STDARG_THR_DEST */ +# endif /* ACE_HAS_PTHREADS_DRAFT4 */ # elif defined (ACE_HAS_STHREADS) ACE_UNUSED_ARG (inst); ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::thr_keycreate (key, dest), @@ -3931,17 +3933,19 @@ ACE_OS::thr_keycreate (ACE_thread_key_t *key, # elif defined (ACE_HAS_PTHREADS) ACE_UNUSED_ARG (inst); -# if defined (ACE_HAS_STDARG_THR_DEST) +# if defined (ACE_HAS_PTHREADS_DRAFT4) +# if defined (ACE_HAS_STDARG_THR_DEST) ACE_OSCALL_RETURN (::pthread_keycreate (key, (void (*)(...)) dest), int, -1); -# elif defined (ACE_HAS_PTHREADS_DRAFT4) +# 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 ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::pthread_key_create (key, dest), ace_result_), int, -1); -# endif /* ACE_HAS_STDARG_THR_DEST */ +# endif /* ACE_HAS_PTHREADS_DRAFT4 */ # elif defined (ACE_HAS_STHREADS) ACE_UNUSED_ARG (inst); |