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 c84524d..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/)
- * This file is part of DevLib - See devlib/README for information.
+ * This file is part of DevLib - See README.devlib for information.
  * -->
  *
  * \brief Portable abstraction for high-resolution time handling (implementation)
@@ -11,22 +11,6 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.4  2004/08/25 14:12:09  rasky
- *#* Aggiornato il comment block dei log RCS
- *#*
- *#* Revision 1.3  2004/08/10 05:45:04  bernie
- *#* Fix spacing in header.
- *#*
- *#* Revision 1.2  2004/06/03 11:27:09  bernie
- *#* Add dual-license information.
- *#*
- *#* Revision 1.1  2004/06/03 09:01:06  bernie
- *#* Import into DevLib.
- *#*
- *#*/
-
 #include "hptime.h"
 
 #if defined(_WIN32)
@@ -50,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;
 }