X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=os%2Fhptime.c;h=771832307efe1493b58a327ef4541ccf1132070d;hb=5f3952176a4e9a00ca8dd5ec4a6b994958f89e0a;hp=57ccf34df46462c52fa6657a199558f5e47b30d7;hpb=5f89cb2ec6cff67bd539eaed89f237ea42a1548e;p=bertos.git

diff --git a/os/hptime.c b/os/hptime.c
old mode 100755
new mode 100644
index 57ccf34d..77183230
--- a/os/hptime.c
+++ b/os/hptime.c
@@ -1,4 +1,4 @@
-/*!
+/**
  * \file
  * <!--
  * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
@@ -11,28 +11,6 @@
  * \author Bernardo Innocenti <bernie@develer.com>
  */
 
-/*#*
- *#* $Log$
- *#* Revision 1.6  2006/02/20 01:46:46  bernie
- *#* Port to MacOSX.
- *#*
- *#* Revision 1.5  2005/11/04 16:20:02  bernie
- *#* Fix reference to README.devlib in header.
- *#*
- *#* 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)
@@ -56,15 +34,16 @@ hptime_t hptime_get(void)
 	return (((hptime_t)ft.dwHighDateTime) << 32) + (hptime_t)ft.dwLowDateTime;
 }
 
-#elif defined(__unix__) || defined(__APPLE__) && defined(__MACH__)
+#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;
 }