diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 16:06:13 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2006-02-09 16:06:13 +0000 |
| commit | 8887093e7976ff54123ee27858d7bdd1e00b7f9b (patch) | |
| tree | 26d3a966aed629ebfc30cd807b828dd9d4832cbf /sal | |
| parent | 66c54865d1fbd76948430b24c72133061cb3f207 (diff) | |
INTEGRATION: CWS hro02 (1.5.64); FILE MERGED
2006/02/06 14:53:07 hro 1.5.64.1: #i44627# Consolidate cross platform implementations for osl conditions
Diffstat (limited to 'sal')
| -rw-r--r-- | sal/osl/unx/conditn.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/sal/osl/unx/conditn.c b/sal/osl/unx/conditn.c index 9cff801254b2..32e3317101af 100644 --- a/sal/osl/unx/conditn.c +++ b/sal/osl/unx/conditn.c @@ -4,9 +4,9 @@ * * $RCSfile: conditn.c,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: rt $ $Date: 2005-09-08 14:53:15 $ + * last change: $Author: rt $ $Date: 2006-02-09 17:06:13 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -208,13 +208,6 @@ sal_Bool SAL_CALL osl_resetCondition(oslCondition Condition) } pCond->m_State = sal_False; - nRet = pthread_cond_broadcast(&pCond->m_Condition); - if ( nRet != 0 ) - { - OSL_TRACE("osl_resetCondition : condition broadcast failed. Errno: %d; %s\n", - nRet, strerror(nRet)); - return sal_False; - } nRet = pthread_mutex_unlock(&pCond->m_Lock); if ( nRet != 0 ) @@ -252,7 +245,7 @@ oslConditionResult SAL_CALL osl_waitCondition(oslCondition Condition, const Time return osl_cond_result_error; } - while ( ! pCond->m_State ) + if ( ! pCond->m_State ) { if ( pTimeout ) { |