X-Git-Url: http://git.indexdata.com/?p=yaz-moved-to-github.git;a=blobdiff_plain;f=src%2Ftiming.c;h=352c03deb89c169105ab4ae415fef5d4999bf138;hp=31c9e358ae081349d72584e9c49f541a2b2f1ce2;hb=43a9d38d20c1b1bcd1a03b2445a501d27526bd35;hpb=2788a4851b551e1a3efb320a2878b809f2d8a9d7

diff --git a/src/timing.c b/src/timing.c
index 31c9e35..352c03d 100644
--- a/src/timing.c
+++ b/src/timing.c
@@ -1,5 +1,5 @@
 /* This file is part of the YAZ toolkit.
- * Copyright (C) 1995-2009 Index Data
+ * Copyright (C) 1995-2011 Index Data
  * See the file LICENSE for details.
  */
 
@@ -34,12 +34,13 @@ struct yaz_timing {
 #endif
 #if HAVE_SYS_TIME_H
     struct timeval start_time, end_time;
-#endif
+#else
 #ifdef WIN32
     LONGLONG start_time, end_time;
     LONGLONG start_time_sys, start_time_user;
     LONGLONG end_time_sys, end_time_user;
 #endif
+#endif
     double real_sec, user_sec, sys_sec;
 };
 
@@ -91,7 +92,7 @@ void yaz_timing_start(yaz_timing_t t)
 #if HAVE_SYS_TIME_H
     gettimeofday(&t->start_time, 0);
     t->real_sec = 0.0;
-#endif
+#else
 #ifdef WIN32
     t->real_sec = 0.0;
     t->user_sec = 0.0;
@@ -99,6 +100,7 @@ void yaz_timing_start(yaz_timing_t t)
     get_date_as_largeinteger(&t->start_time);
     get_process_time(&t->start_time_user, &t->start_time_sys);
 #endif
+#endif
 }
 
 void yaz_timing_stop(yaz_timing_t t)
@@ -113,8 +115,7 @@ void yaz_timing_stop(yaz_timing_t t)
     gettimeofday(&t->end_time, 0);
     t->real_sec = ((t->end_time.tv_sec - t->start_time.tv_sec) * 1000000.0 +
                    t->end_time.tv_usec - t->start_time.tv_usec) / 1000000;
-    
-#endif
+#else    
 #ifdef WIN32
     get_date_as_largeinteger(&t->end_time);
     t->real_sec = (t->end_time - t->start_time) / 10000000.0;
@@ -123,6 +124,7 @@ void yaz_timing_stop(yaz_timing_t t)
     t->user_sec = (t->end_time_user - t->start_time_user) / 10000000.0;
     t->sys_sec = (t->end_time_sys - t->start_time_sys) / 10000000.0;
 #endif
+#endif
 }
 
 double yaz_timing_get_real(yaz_timing_t t)
@@ -152,6 +154,7 @@ void yaz_timing_destroy(yaz_timing_t *tp)
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab