diff options
| author | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-04 22:42:53 +0000 |
|---|---|---|
| committer | dhinton <dhinton@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2002-05-04 22:42:53 +0000 |
| commit | 70f8b49af9931ceebe35c476735ea46e866be85f (patch) | |
| tree | c2022ebc4796517f6b2a489379074f3512eab3d7 | |
| parent | ece47c2616855452195bee2a2eaa00551ed64a21 (diff) | |
| download | ATCD-70f8b49af9931ceebe35c476735ea46e866be85f.tar.gz | |
ChangeLogTag:Sat May 4 22:35:23 UTC 2002 Don Hinton <dhinton@ieee.org>
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-02a | 6 | ||||
| -rw-r--r-- | ChangeLogs/ChangeLog-03a | 6 | ||||
| -rw-r--r-- | ace/OS.i | 21 | ||||
| -rw-r--r-- | ace/ace_threads.h | 1 |
5 files changed, 28 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog index 620db33835b..8774344db08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat May 4 22:35:23 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/OS.i (sema_destroy): + + Fixed an ifdef error introduced when PACE was removed. + Sat May 4 18:50:25 UTC 2002 Don Hinton <dhinton@ieee.org> * ace/ace_dll.dsp: diff --git a/ChangeLogs/ChangeLog-02a b/ChangeLogs/ChangeLog-02a index 620db33835b..8774344db08 100644 --- a/ChangeLogs/ChangeLog-02a +++ b/ChangeLogs/ChangeLog-02a @@ -1,3 +1,9 @@ +Sat May 4 22:35:23 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/OS.i (sema_destroy): + + Fixed an ifdef error introduced when PACE was removed. + Sat May 4 18:50:25 UTC 2002 Don Hinton <dhinton@ieee.org> * ace/ace_dll.dsp: diff --git a/ChangeLogs/ChangeLog-03a b/ChangeLogs/ChangeLog-03a index 620db33835b..8774344db08 100644 --- a/ChangeLogs/ChangeLog-03a +++ b/ChangeLogs/ChangeLog-03a @@ -1,3 +1,9 @@ +Sat May 4 22:35:23 UTC 2002 Don Hinton <dhinton@ieee.org> + + * ace/OS.i (sema_destroy): + + Fixed an ifdef error introduced when PACE was removed. + Sat May 4 18:50:25 UTC 2002 Don Hinton <dhinton@ieee.org> * ace/ace_dll.dsp: @@ -2622,34 +2622,33 @@ ACE_OS::sema_destroy (ACE_sema_t *s) s->sema_ = 0; return result; } -# if defined (ACE_HAS_THREADS) -# if defined (ACE_HAS_STHREADS) +#elif defined (ACE_HAS_THREADS) +# if defined (ACE_HAS_STHREADS) ACE_OSCALL_RETURN (ACE_ADAPT_RETVAL (::sema_destroy (s), ace_result_), int, -1); -# elif defined (ACE_HAS_PTHREADS) +# elif defined (ACE_HAS_PTHREADS) int r1 = ACE_OS::mutex_destroy (&s->lock_); int r2 = ACE_OS::cond_destroy (&s->count_nonzero_); return r1 != 0 || r2 != 0 ? -1 : 0; -# elif defined (ACE_HAS_WTHREADS) -# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) +# elif defined (ACE_HAS_WTHREADS) +# if !defined (ACE_USES_WINCE_SEMA_SIMULATION) ACE_WIN32CALL_RETURN (ACE_ADAPT_RETVAL (::CloseHandle (*s), ace_result_), int, -1); -# else /* ACE_USES_WINCE_SEMA_SIMULATION */ +# else /* ACE_USES_WINCE_SEMA_SIMULATION */ // Free up underlying objects of the simulated semaphore. int r1 = ACE_OS::thread_mutex_destroy (&s->lock_); int r2 = ACE_OS::event_destroy (&s->count_nonzero_); return r1 != 0 || r2 != 0 ? -1 : 0; -# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ -# elif defined (ACE_PSOS) +# endif /* ACE_USES_WINCE_SEMA_SIMULATION */ +# elif defined (ACE_PSOS) int result; ACE_OSCALL (ACE_ADAPT_RETVAL (::sm_delete (s->sema_), result), int, -1, result); s->sema_ = 0; return result; -# elif defined (VXWORKS) +# elif defined (VXWORKS) int result; ACE_OSCALL (::semDelete (s->sema_), int, -1, result); s->sema_ = 0; return result; -# endif /* ACE_HAS_STHREADS */ -# endif /* ACE_HAS_THREADS */ +# endif /* ACE_HAS_STHREADS */ #else ACE_UNUSED_ARG (s); ACE_NOTSUP_RETURN (-1); diff --git a/ace/ace_threads.h b/ace/ace_threads.h index 573a7ed428a..2c89d231a36 100644 --- a/ace/ace_threads.h +++ b/ace/ace_threads.h @@ -133,7 +133,6 @@ extern "C" pthread_t pthread_self (void); # define SEM_FAILED ((sem_t *) -1) # endif /* !SEM_FAILED */ - typedef struct { sem_t *sema_; |