summaryrefslogtreecommitdiff
path: root/sal/osl/unx
diff options
context:
space:
mode:
authorGregor Hartmann <gh@openoffice.org>2001-03-20 13:31:51 +0000
committerGregor Hartmann <gh@openoffice.org>2001-03-20 13:31:51 +0000
commitc923eb1a72c4a6472aa83625ea675dd08a899f5e (patch)
tree3189475959c795d4234ae3ff7160e6a661e53a6b /sal/osl/unx
parenta35b9e1a41e29bfbe9439c1a4c17dd787478836b (diff)
fixed expression to terminate loop in osl_SleepThread and osl_ScheduleThread
Diffstat (limited to 'sal/osl/unx')
-rw-r--r--sal/osl/unx/thread.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/sal/osl/unx/thread.c b/sal/osl/unx/thread.c
index d10c258d05cb..79c7466ad585 100644
--- a/sal/osl/unx/thread.c
+++ b/sal/osl/unx/thread.c
@@ -2,9 +2,9 @@
*
* $RCSfile: thread.c,v $
*
- * $Revision: 1.11 $
+ * $Revision: 1.12 $
*
- * last change: $Author: jl $ $Date: 2001-03-14 09:48:11 $
+ * last change: $Author: gh $ $Date: 2001-03-20 14:31:51 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -887,7 +887,7 @@ oslThreadSleep SAL_CALL osl_sleepThread(oslThread Thread, const TimeValue* pDela
{
ret = pthread_cond_timedwait(&pThreadImpl->m_Suspend, &pThreadImpl->m_AccessLock, &delay);
}
- while ( ret != 0 && ( ret != ETIME || ret != ETIMEDOUT ) );
+ while ( ret != 0 && ( ret != ETIME && ret != ETIMEDOUT ) );
pthread_mutex_unlock(&pThreadImpl->m_AccessLock);
@@ -1041,7 +1041,7 @@ sal_Bool SAL_CALL osl_scheduleThread(oslThread Thread)
{
ret = pthread_cond_timedwait(&pThreadImpl->m_Suspend, &pThreadImpl->m_AccessLock, &delay);
}
- while ( ret != 0 && ( ret != ETIME || ret != ETIMEDOUT ) );
+ while ( ret != 0 && ( ret != ETIME && ret != ETIMEDOUT ) );
pthread_mutex_unlock(&pThreadImpl->m_AccessLock);