X-Git-Url: https://codewiz.org/gitweb?a=blobdiff_plain;f=os%2Fhptime.c;h=b93712baf44794db2b74b45548e710e72222dd0b;hb=33d48af0258dd55e1d2b51a4ae2f87401dcb00e9;hp=07b0a30fd4a3eedc9ce66895002e6427705b7974;hpb=f4a24c811a668a072b6688bcdfcd927529977b26;p=bertos.git

diff --git a/os/hptime.c b/os/hptime.c
old mode 100755
new mode 100644
index 07b0a30f..b93712ba
--- a/os/hptime.c
+++ b/os/hptime.c
@@ -1,8 +1,33 @@
-/*!
+/**
  * \file
  * <!--
- * Copyright 2003,2004 Develer S.r.l. (http://www.develer.com/)
- * All rights reserved.
+ * This file is part of BeRTOS.
+ *
+ * Bertos is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * As a special exception, you may use this file as part of a free software
+ * library without restriction.  Specifically, if other files instantiate
+ * templates or use macros or inline functions from this file, or you compile
+ * this file and link it with other files to produce an executable, this
+ * file does not by itself cause the resulting executable to be covered by
+ * the GNU General Public License.  This exception does not however
+ * invalidate any other reasons why the executable file might be covered by
+ * the GNU General Public License.
+ *
+ * Copyright 2003, 2004 Develer S.r.l. (http://www.develer.com/)
+ *
  * -->
  *
  * \brief Portable abstraction for high-resolution time handling (implementation)
@@ -11,13 +36,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 +59,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;
 }