diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2015-08-12 21:38:20 -0500 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-13 06:59:30 +0000 |
| commit | 2c797c39478b485c0285eb351d23e0d4e0fa7585 (patch) | |
| tree | ec066cc6e261daed38926cea8aa86d25d68d3b4c /vcl/osx/saltimer.cxx | |
| parent | 4498c5e1d0e0c98055d6ce6ad22c840e89b401cc (diff) | |
kill YIELD_GUARD macro
Change-Id: I81990df584255f4a286cd078bcf15917c00ad504
Reviewed-on: https://gerrit.libreoffice.org/17687
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'vcl/osx/saltimer.cxx')
| -rw-r--r-- | vcl/osx/saltimer.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/vcl/osx/saltimer.cxx b/vcl/osx/saltimer.cxx index 377044730e76..eb62693e85a6 100644 --- a/vcl/osx/saltimer.cxx +++ b/vcl/osx/saltimer.cxx @@ -17,6 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ +#include <sal/config.h> + #include "osx/saltimer.h" #include "osx/salnstimer.h" #include "osx/saldata.hxx" @@ -36,8 +38,10 @@ void ImplSalStartTimer( sal_uLong nMS ) if( AquaSalTimer::pRunningTimer != nil ) { if( [AquaSalTimer::pRunningTimer timeInterval] == aTI ) + { // set new fire date [AquaSalTimer::pRunningTimer setFireDate: [NSDate dateWithTimeIntervalSinceNow: aTI]]; + } else { [AquaSalTimer::pRunningTimer invalidate]; @@ -89,7 +93,7 @@ void AquaSalTimer::handleStartTimerEvent( NSEvent* pEvent ) NSTimeInterval current = [NSDate timeIntervalSinceReferenceDate]; if( (posted - current) <= 0.0 ) { - YIELD_GUARD; + SolarMutexGuard aGuard; if( pSVData->mpSalTimer ) { // timer already elapsed since event posted |