Sistema l'errore da me commesso in fase di conversione...

[bertos.git] / os / hptime.c

diff --git a/os/hptime.c b/os/hptime.c
old mode 100755 (executable)
new mode 100644 (file)
index 07b0a30..7718323
--- a/os/hptime.c
+++ b/os/hptime.c
@@ -1,8 +1,8 @@
-/*!
+/**
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * All rights reserved.
+ * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief Portable abstraction for high-resolution time handling (implementation)
@@ -11,13 +11,6 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*
- * $Log$
- * Revision 1.1  2004/06/03 09:01:06  bernie
- * Import into DevLib.
- *
- */
-
 #include "hptime.h"
 
 #if defined(_WIN32)
@@ -41,15 +34,16 @@ hptime_t hptime_get(void)
        return (((hptime_t)ft.dwHighDateTime) << 32) + (hptime_t)ft.dwLowDateTime;
 }
 
-#elif defined(__unix__)
+#elif defined(__unix__) || (defined(__APPLE__) && defined(__MACH__))
 
-#include <sys/time.h>
+#include <sys/time.h> /* for gettimeofday() */
+#include <stddef.h> /* for NULL */
 
 hptime_t hptime_get(void)
 {
        struct timeval tv;
 
-       gettimeofday(&tv, 0);
+       gettimeofday(&tv, NULL);
        return (hptime_t)tv.tv_sec * HPTIME_TICKS_PER_SECOND
                + (hptime_t)tv.tv_usec;
 }