[PATCH] sal osl_getGlobalTimer: Don't confuse start and current time...

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/3979

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/79/3979/1

sal osl_getGlobalTimer: Don't confuse start and current time.

Change-Id: I575dd70d6b80d4f3279476037e509550cfa23fde
---
M sal/osl/unx/time.c
1 file changed, 2 insertions(+), 4 deletions(-)



diff --git a/sal/osl/unx/time.c b/sal/osl/unx/time.c
index 94a935e..227f502 100644
--- a/sal/osl/unx/time.c
+++ b/sal/osl/unx/time.c
@@ -298,8 +298,6 @@
     sal_uInt32 nSeconds;
 
 #if defined(MACOSX) || defined(IOS)
-    startTime = mach_absolute_time();
-
     double diff = (double)(mach_absolute_time() - startTime) * adjust_time_factor * 1000;
     nSeconds = (sal_uInt32)diff;
 #else
@@ -307,9 +305,9 @@
     int res;
 
 #if defined(USE_CLOCK_GETTIME)
-    res = clock_gettime(CLOCK_REALTIME, &startTime);
+    res = clock_gettime(CLOCK_REALTIME, &currentTime);
 #else
-    res = gettimeofday( &startTime, NULL );
+    res = gettimeofday( &currentTime, NULL );
 #endif
     assert(res == 0);
 

-- 
To view, visit https://gerrit.libreoffice.org/3979
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I575dd70d6b80d4f3279476037e509550cfa23fde
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Mark Wielaard <mark@klomp.org>