[Libreoffice-commits] core.git: smoketest/libtest.cxx

Michael Meeks michael.meeks at collabora.com
Thu Nov 7 15:47:03 CET 2013


 smoketest/libtest.cxx |   17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

New commits:
commit 7f7d116c2b723123e7374cdbb77c47fc067a828f
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu Nov 7 14:46:20 2013 +0000

    liblibo: use gettimeofday not clock_gettime for better portability.
    
    Change-Id: Ic111faf5db7709483f20fea8cbf9ff4298301b8a

diff --git a/smoketest/libtest.cxx b/smoketest/libtest.cxx
index 39a0098..2ec55cf 100644
--- a/smoketest/libtest.cxx
+++ b/smoketest/libtest.cxx
@@ -12,10 +12,15 @@
 #include <malloc.h>
 #include <assert.h>
 #include <math.h>
-#include <time.h>
+#include <sys/time.h>
 #include <liblibreoffice.hxx>
 
-long getTimeMS();
+long getTimeMS()
+{
+    struct timeval t;
+    gettimeofday(&t, NULL);
+    return t.tv_sec*1000 + t.tv_usec/1000;
+}
 
 static int help()
 {
@@ -99,12 +104,4 @@ int main (int argc, char **argv)
     return 0;
 }
 
-long getTimeMS()
-{
-    struct timespec t;
-    clock_gettime(CLOCK_MONOTONIC, &t);
-    long ms = round(t.tv_nsec / 1.0e6) + t.tv_sec * 1000;
-    return ms;
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */


More information about the Libreoffice-commits mailing list