summaryrefslogtreecommitdiff
path: root/ace/OS.i
diff options
context:
space:
mode:
authorirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-01-27 07:03:16 +0000
committerirfan <irfan@ae88bc3d-4319-0410-8dbf-d08b4c9d3795>2001-01-27 07:03:16 +0000
commitfab50c8ab2bc742b8d810b53be22c40bad2ce709 (patch)
tree990f37bcb4fb4ceb6d2d2bb59259126760c1fc5d /ace/OS.i
parent8806d899d2cd667d02ec2dedf1ef257ef8c8a559 (diff)
downloadATCD-fab50c8ab2bc742b8d810b53be22c40bad2ce709.tar.gz
Small fixes.
Diffstat (limited to 'ace/OS.i')
-rw-r--r--ace/OS.i12
1 files changed, 6 insertions, 6 deletions
diff --git a/ace/OS.i b/ace/OS.i
index b0ff764157b..1865990c16d 100644
--- a/ace/OS.i
+++ b/ace/OS.i
@@ -2027,14 +2027,14 @@ ACE_OS::mutex_lock (ACE_mutex_t *m,
# elif defined (ACE_HAS_WTHREADS)
+ // Note that we must convert between absolute time (which is passed
+ // as a parameter) and relative time (which is what the system call
+ // expects).
+ ACE_Time_Value relative_time (timeout - ACE_OS::gettimeofday ());
+
switch (m->type_)
{
case USYNC_PROCESS:
- // Note that we must convert between absolute time (which is
- // passed as a parameter) and relative time (which is what the
- // system call expects).
- ACE_Time_Value relative_time (timeout - ACE_OS::gettimeofday ());
-
switch (::WaitForSingleObject (m->proc_mutex_,
relative_time.msec ()))
{
@@ -2285,7 +2285,7 @@ ACE_OS::thread_mutex_lock (ACE_thread_mutex_t *m,
// timeouts due to a lack of timeout features for this type of MS
// Windows synchronization mechanism.
-#if defined (ACE_HAS_THREADS)
+#if defined (ACE_HAS_THREADS) && !defined (ACE_HAS_WTHREADS)
# if defined (ACE_HAS_STHREADS) || defined (ACE_HAS_PTHREADS) || defined (ACE_HAS_PACE)
return ACE_OS::mutex_lock (m, timeout);
#elif defined (VXWORKS) || defined (ACE_PSOS)