Happy new year

[yaz-moved-to-github.git] / src / timing.c

diff --git a/src/timing.c b/src/timing.c
index 0486eb8..31c9e35 100644 (file)
--- a/src/timing.c
+++ b/src/timing.c
@@ -1,8 +1,6 @@
-/*
- * Copyright (C) 1995-2007, Index Data ApS
+/* This file is part of the YAZ toolkit.
+ * Copyright (C) 1995-2009 Index Data
  * See the file LICENSE for details.
- *
- * $Id: timing.c,v 1.4 2007-01-05 14:05:24 adam Exp $
  */
 
 /**
@@ -38,16 +36,16 @@ struct yaz_timing {
     struct timeval start_time, end_time;
 #endif
 #ifdef WIN32
-    ULONGLONG start_time, end_time;
-    ULONGLONG start_time_sys, start_time_user;
-    ULONGLONG end_time_sys, end_time_user;
+    LONGLONG start_time, end_time;
+    LONGLONG start_time_sys, start_time_user;
+    LONGLONG end_time_sys, end_time_user;
 #endif
     double real_sec, user_sec, sys_sec;
 };
 
 yaz_timing_t yaz_timing_create(void)
 {
-    yaz_timing_t t = xmalloc(sizeof(*t));
+    yaz_timing_t t = (yaz_timing_t) xmalloc(sizeof(*t));
     yaz_timing_start(t);
     return t;
 }
@@ -67,7 +65,7 @@ static void get_process_time(ULONGLONG *lp_user, ULONGLONG *lp_sys)
     li.HighPart = sys_t.dwHighDateTime;
     *lp_sys = li.QuadPart;
 }
-static void get_date_as_largeinteger(ULONGLONG *lp)
+static void get_date_as_largeinteger(LONGLONG *lp)
 {
     FILETIME f;
     ULARGE_INTEGER li;